Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
68,734 Commits 2 Branches 0 Tags
1beed61b761d3f964f57f99235c479ff1ddfe26f
Commit Graph

1568 Commits

Author SHA1 Message Date
Sybren A. Stüvel
cc2d501642 Merge branch 'master' into blender2.8 2017-04-21 16:30:24 +02:00
Sergey Sharybin
e4ab70da86 CMake: Add option to build against system-wide Glog 
Similar to previous commit for Gflags.
 2017-04-21 14:36:34 +02:00
Sybren A. Stüvel
81011679dd Merge branch 'master' into blender2.8 2017-04-21 14:19:05 +02:00
Sergey Sharybin
c7a5c48cba CMake: Add option to link against system-wide Gflags library 
It is disabled by default, so should not affect existing configurations.

Main benefits of this goes as:

- Linux distros can use that to avoid libraries duplication and link
  blender package against gflags package from the system.

- It it easier to test whether Blender works with updated version of
  Gflags prior to re-bundling the library.
 2017-04-21 12:01:27 +02:00
Dalai Felinto
c9d78b6c43 Merge remote-tracking branch 'origin/master' into blender2.8 2017-04-18 16:30:13 +02:00
Bastien Montagne
3922d5194f Fix install_deps.sh for new Ubuntu 17.04, which does not have libopenjpeg! 2017-04-18 15:24:09 +02:00
Bastien Montagne
95b3632112 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
 2017-04-14 12:39:54 +02:00
Sergey Sharybin
7cfabcef5c Buildbot: Fix typos 2017-04-14 10:03:51 +02:00
Sergey Sharybin
b354c15805 Buildbot: Attempt to fix CUDA compilation on OSX 
Stupid toolkit is really fragile about CLang version.
 2017-04-14 10:01:28 +02:00
Sergey Sharybin
513aacbdb6 Use immediate mode API for OpenColorIO 2017-04-11 15:39:04 +02:00
Bastien Montagne
346964eb3f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/gpencil/drawgpencil.c
 2017-04-10 16:53:12 +02:00
Luca Rood
358def15a3 Install deps: Fix compilation error of Alembic 
Couple of things here:

- Boost is not necesserily compiled into your /opt/lib and system-wide
  version might have been used. The recent change in Alembic did not
  take this into account.

- Alembic needs some extra component of Boost.
  This part might be missing now for other distros than DEB.
 2017-04-10 15:55:25 +02:00
Campbell Barton
c800ee6bfe Merge branch 'master' into blender2.8 2017-04-09 16:09:12 +10:00
Sybren A. Stüvel
063bae4fcc Merge branch 'master' into blender2.8 
# Conflicts:
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/abc_util.cc
 2017-04-07 17:28:22 +02:00
Sergey Sharybin
eae691f89e Buildbot: List freetype for OIIO libraries 
OIIO in release environment is compiled with Freetype support.

This fixes compilation error of static unit tests.
 2017-04-07 17:01:07 +02:00
Sergey Sharybin
07708b85b4 Buildbot: Link statically against freetype 2017-04-07 17:00:43 +02:00
Sergey Sharybin
4360a74715 CMake: Fix detection of idiff program 2017-04-07 17:00:06 +02:00
Sergey Sharybin
c637e749b2 Tests: Fix compilation error with static OpenMP 2017-04-07 16:06:28 +02:00
Sybren A. Stüvel
8ae656bf22 CMake: Fixed order of bf_alembic in SETUP_BLENDER_SORTED_LIBS 
bf_alembic depends on bf_bmesh, and should therefore be above it.
 2017-04-06 16:47:00 +02:00
Sergey Sharybin
0feca278a4 Merge branch 'master' into blender2.8 2017-04-06 12:31:26 +02:00
Sergey Sharybin
ae76a90593 Buildbot: Correct previous release 
Seems CMake is not happy about changing compiler from script.
 2017-04-06 11:39:06 +02:00
Sergey Sharybin
97300a3beb Buildbot: Force build environment to use latest GCC 2017-04-06 11:21:07 +02:00
Bastien Montagne
e9bb018a4a Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.h
 2017-04-05 10:02:25 +02:00
Bastien Montagne
8647d5af90 InstallDeps: Raise minimal & official version of OIIO to 1.7.13. 
As requested by @sergey.
 2017-04-05 09:26:41 +02:00
Sergey Sharybin
7fc84d4e32 Merge branch 'master' into blender2.8 2017-04-04 15:47:58 +02:00
Sybren A. Stüvel
a63a31dd12 install_deps: removed leftover compile_HDF5 command 
It was a leftover from when Alembic with HDF5 was still officially
supported.
 2017-04-04 14:50:58 +02:00
Sybren A. Stüvel
8a60d84327 Bumped Alembic library version to 1.7.1 
This provides us with a clearer API (so I don't have to use const_cast<>
in upcoming code). It also allows layering of different Alembic files,
so you can have a base file and load a separate file containing overrides.

Verbally approved by Dr. Sergey.
 2017-04-04 12:55:38 +02:00
Sergey Sharybin
ffac92e385 Buildbot: Update master config 2017-04-04 12:52:54 +02:00
Sybren A. Stüvel
b93ddfd8ac Alembic: force ALEMBIC_LIB_USES_BOOST=ON when not using C++11 
Alembic requires one of ALEMBIC_LIB_USES_BOOST, ALEMBIC_LIB_USES_TR1, or
C++11, and silently defaults to the latter if the former two are OFF.

Before this change, Alembic was only built without C++11 of OpenEXR
was built at the same time. This dependency was both unnecessary and
undocumented.
 2017-04-04 12:41:44 +02:00
Sergey Sharybin
4f7eb3ad12 Buildbot: Update master config 2017-04-04 12:15:35 +02:00
Sergey Sharybin
728f75c6a7 Buildbot: Some more twqeaks to master config 2017-04-03 15:51:31 +02:00
Sergey Sharybin
e741804ce3 Buildbot: Update bundled vetrsion of server configuration 2017-04-03 15:36:52 +02:00
Sergey Sharybin
5884c9f1ba Merge branch 'master' into blender2.8 2017-04-03 15:15:56 +02:00
Sergey Sharybin
cc93a66e71 Buildbot: SPecial branch trickery for linux slaves 2017-04-03 15:04:16 +02:00
Sergey Sharybin
d27ef3913a Buildbot: Some special tricks for Blender 2.8 slave 2017-04-03 14:49:07 +02:00
Campbell Barton
2be098a1a0 Merge branch 'master' into blender2.8 2017-03-29 20:20:53 +11:00
Sergey Sharybin
b3f9ae0125 Buildbot: Revert previous change, older toolkit has same exact behavior 2017-03-29 10:48:10 +02:00
Sergey Sharybin
15ff75d06b Buildbot: Use older NVCC on 32bit linux 
Newer toolkit has some weird issue with cross0-compiling 32bit kernels
from 64bit environment.
 2017-03-29 10:21:17 +02:00
Sergey Sharybin
ac43e5cc87 Buildbot: Remove global hardcoded NVCC path 
This was initially needed for heterogeneous setup of two toolkits which
we no longer need.
 2017-03-29 10:16:41 +02:00
Campbell Barton
0c93bc2b63 Merge branch 'master' into blender2.8 2017-03-25 13:39:47 +11:00
Sergey Sharybin
e32710d2d7 Buildbot: Use proper NVCC path 
In fact, we could probably remove this option all together.
 2017-03-24 10:27:41 +01:00
Bastien Montagne
797b1d5053 Fix T51024: Switch install_deps to set OSL_ROOT_DIR instead of CYCLES_OSL. 
Path by @alekulyn, thanks.

Differential Revision: https://developer.blender.org/D2571
 2017-03-22 12:05:43 +01:00
Mike Erwin
4452bea2f1 move Gawain library to intern 
Before now it lived in source/blender/gpu for convenience. Only a few files in the gpu module use Gawain directly.

Tested on Mac, time to push and test on Windows.

Todo: some CMake magic to make it easy to
#include "gawain/some_header.h"
from any C or H file. Main problem here is the many editors that include GPU_immediate.h which includes Gawain's immediate.h -- is there a way to avoid changing every editor's CMakeLists?
 2017-03-16 23:32:35 -04:00
Mike Erwin
b4e8dc8c82 set required MacOS version to 10.9 
We could do more to simplify build files, but this is a start.
 2017-03-16 15:02:55 -04:00
Campbell Barton
fbb1b311ea Merge branch 'master' into blender2.8 2017-03-12 03:00:06 +11:00
Campbell Barton
bcc8c04db4 Cleanup: code style & cmake 2017-03-12 02:47:53 +11:00
Campbell Barton
8901263b5f Merge branch 'master' into blender2.8 2017-03-02 00:22:13 +11:00
Aaron Carlisle
c1012c6c3a Cleanup: update copyright and Blender description 2017-02-28 12:04:43 -05:00
Dalai Felinto
574d6011f4 Revert "Collection Editor based on patch by Julian Eisel" 
This reverts commit 3da834e83ce9d7056c033148dab04885a6d3b1b7.

We will use the outliner for this now.

I'm also moving the collections_ops.c to outliner_collections.c
 2017-02-15 18:17:34 +01:00
Sybren A. Stüvel
d4913af846 Merge branch 'master' into blender2.8 
# Conflicts:
#	source/blender/blenloader/intern/writefile.c
 2017-02-08 13:10:16 +01:00