kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
42,390 Commits 2 Branches 0 Tags 753 MiB
5850e62262
Commit Graph

41 Commits

Author SHA1 Message Date
Bastien Montagne
5850e62262 Attempt to fix problems with local built py caused by own r51976. 2012-11-07 12:24:03 +00:00
Bastien Montagne
fff3f95768 Update to make it work with new debian-like py3.3 packages. A bit hackish (this arch-dependent stuff makes things a bit complex), and probably only working for amd64 arch, but at least should not create any regression... 2012-11-07 11:44:39 +00:00
Campbell Barton
004f8d78ed default to Python3.3 on Linux for SCons and CMake, warn when building with python 3.2x or older. 
also remove casts to keep Python3.2 warning quiet.
 2012-11-05 13:48:42 +00:00
Sergey Sharybin
b93da9b01e Color Management, Stage 1: Initial OpenColorIO library integration 
This commit integrates support of OpenColorIO library into build systems.

It also contains C-API for OpenColorIO library which could be used by Blender.

CMake has got find rules familiar to OpenImageIO's one which makes it easier
for build system to find needed libraries and includes. Scons only could use
explicitly defined paths to libraries and includes.

C-API would be compiled and Blender would be linked against C-API and OpenColorIO
but it wouldn't affect on Blender behavior at all.

OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and
setting WITH_BF_OCIO in Scons.
 2012-09-15 10:03:17 +00:00
Sergey Sharybin
0682c3f1ae Code cleanup and minor change to CMake's colalda detection to make 
it detect directory structure used for libs in our svn (<root>/include/<component>/include)
 2012-08-11 10:32:27 +00:00
Campbell Barton
6ca7d82932 code cleanup: white space, spelling & ';;' end of lines. 2012-02-25 16:04:03 +00:00
Campbell Barton
61596d5bb3 patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes 
made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.
 2012-02-17 19:21:47 +00:00
Campbell Barton
4d9766aacf minor cleanup 
- remove / comment unused python vars
- replace mul_v3_fl(somevec, -1.0f); with negate_v3(somevec);
 2011-11-16 16:38:37 +00:00
Brecht Van Lommel
942d2fe3b7 Cycles: svn merge -r41467:41531 ^/trunk/blender 2011-11-04 20:21:40 +00:00
Campbell Barton
b07d92408b cmake could ignore defines for python lib/include passed from the command line if both weren't defined. 2011-11-02 21:35:00 +00:00
Brecht Van Lommel
10af15b85b Cycles: svn merge -r40934:41157 ^/trunk/blender 2011-10-21 20:13:12 +00:00
Campbell Barton
43de42824f cmake's find glew wasnt working right - if glew wasnt found installing the package would not help since the not-found result was cached. 2011-10-14 12:17:35 +00:00
Campbell Barton
fa3b4e1830 correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning. 2011-10-13 14:10:38 +00:00
Brecht Van Lommel
4f33d65ba1 Cycles: svn merge -r40411:40934 ^/trunk/blender 2011-10-11 14:30:53 +00:00
Campbell Barton
da73642ed1 remove find samplerate module, use -msse2 flag for intel c++ since its supported. 2011-10-02 17:16:28 +00:00
Campbell Barton
077fd13416 cmake: 
- fix for cmake's SSE detection which would fail because of strict warnings and also had redundant cache setting.
- was incorrectly initializing variables (own bad)
- python was searching for libs on every run, now only do this if there not cached.
 2011-10-01 19:52:33 +00:00
Campbell Barton
08d52fcc85 added FindOpenImageIO cmake module. 2011-09-18 04:55:22 +00:00
Campbell Barton
dd2a2ec699 removed nodes from CMake's BLENDER_LINK_LIBS, rewrote find-pcre using own template. 2011-09-14 01:23:17 +00:00
Campbell Barton
21253def7c - removed some duplicate library links from cmake (which were needed because of bad level calls) 
- FindXML2 we had copied from another project was always running and not using cached value, rewrote based on template used for most of our other find modules which makes use of 'FindPackageHandleStandardArgs'
- mark statuc collada libs as advanced.
 2011-09-14 01:02:57 +00:00
Campbell Barton
c61827ed25 patch from Uncle_Entity on IRC for fedora/collada 2011-09-08 03:57:11 +00:00
Campbell Barton
18d66643f4 this should finally fix collada & ubuntu building with cmake 2011-08-24 18:13:11 +00:00
Campbell Barton
242035fa2d attempt to fix issue with opencollada + ubuntu ppa 2011-08-24 17:09:25 +00:00
Campbell Barton
9ad6434c4e opencollada find module. hopefully solves the problem where includes can in an /include subdir or not. 2011-08-24 16:04:35 +00:00
Campbell Barton
baa37b1b46 more cmake/x11 edits 
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
 2011-08-02 06:32:53 +00:00
Campbell Barton
78ea4561a4 fix for python ABI search, was missing 'd' 2011-06-20 09:39:14 +00:00
Campbell Barton
97a85fe100 - add example for python rna property update 
- edit the copyright for blender specific cmake find modules
 2011-06-20 02:54:56 +00:00
Campbell Barton
c6eaa2300a cmake: add find jack module 2011-06-19 15:03:50 +00:00
Campbell Barton
a8d4c1f8a9 cmake: add find jemalloc module 2011-06-19 14:55:51 +00:00
Campbell Barton
6790dbe9db cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables. 2011-06-19 13:06:21 +00:00
Campbell Barton
e7c8169086 add back PYTHON_LIBPATH, needed for installing on python 2011-06-19 11:04:15 +00:00
Campbell Barton
def6bcd4e5 cmake add module for finding fftw3. 
also allow debug blender to build with non debug python
 2011-06-19 08:57:34 +00:00
Campbell Barton
167bcc2b67 cmake: add libsamplerate find module 2011-06-19 08:20:02 +00:00
Campbell Barton
b15a2b0ffc cmake: added FindOpenJPEG module. 2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f cmake: 
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
 useful to create names for debug libs on windows.
 2011-06-19 06:57:56 +00:00
Campbell Barton
2c68bdb03e cmake: make python search into a find package module. 2011-06-18 15:53:47 +00:00
Campbell Barton
549c2c58a1 added FindSndFile cmake module to replace inline checks. 2011-06-18 12:12:19 +00:00
Campbell Barton
2e8ca6d196 include some extra search paths for cmake openexr 2011-06-16 02:55:26 +00:00
Campbell Barton
0575c05eb0 fix to FindOpenEXR pointed out by Sergey Sharybin, 
also added check for IlmThread and marked individual library cache variables as advanced.
 2011-06-16 02:48:07 +00:00
Campbell Barton
4f3936083a replace own inline cmake include search logic for a typical FindXXX.cmake module. 2011-06-15 12:09:02 +00:00
Guillermo S. Romero
d00501dfd0 SVN maintenance. 2011-04-06 00:22:44 +00:00
Campbell Barton
ca254dd37b add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library. 2011-04-05 23:31:01 +00:00