sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
41,412 Commits 2 Branches 0 Tags 753 MiB
77b90a94c9
Commit Graph

576 Commits

Author SHA1 Message Date
Jens Verwiebe
77b90a94c9 OSX/cmake: simplificate compile conditions and silence lot of CLANG warnings 2012-10-01 14:03:02 +00:00
Campbell Barton
589ada7f0c code cleanup: correct spelling 2012-09-28 06:45:20 +00:00
Campbell Barton
aa49ca25d5 incorrect spelling in comments 2012-09-26 20:05:38 +00:00
Jens Verwiebe
29ad5fc5e8 fix osx/ols compile after #50876 2012-09-25 18:30:37 +00:00
Alexander Pinzon
38b93b968c Unification of names for the BOOST library directory in Windows 32 and win64 2012-09-25 15:27:11 +00:00
Alexander Pinzon
c0a7773ccf Boost directories were not properly configured to vc2010. 
Opencolorio directories and openimageio not work as you would expect macro
 2012-09-25 15:11:34 +00:00
Jens Verwiebe
3d6e2c2af6 fix cmake in case the boostlibs don't contain boost_python3 refactor ( was possibly not correct) 2012-09-24 20:37:18 +00:00
Jens Verwiebe
71a3339032 fix cmake in case the boostlibs don't contain boost_python3 yet 2012-09-24 19:53:33 +00:00
Jens Verwiebe
87a8aea313 OSL/cmake: the non-intrusive parts, so other os-maintainers can take code over 2012-09-24 19:06:28 +00:00
Campbell Barton
be2454dc55 add back -Wundef for g++, also correct clang warnings and add -Wunused-macros warning. 2012-09-20 09:19:49 +00:00
Campbell Barton
ff834242b7 ffmpeg was adding an include just incase, without a cmake find module here - just check if the dir exists. 2012-09-20 07:43:48 +00:00
Campbell Barton
25c96bc9f3 code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc 2012-09-20 01:02:39 +00:00
Antony Riakiotakis
2e3d044cd9 -Wnonnull flag is not for C++. I think we all know it by now, time to 
get rid of it.
 2012-09-18 14:17:10 +00:00
Campbell Barton
6df4c1317f code cleanup: use system includes for cmake, otherwise warnings get printed in headers. 2012-09-18 04:40:20 +00:00
Antony Riakiotakis
3968b63735 * Enable opencolorio for scons/mingw32 (coming very soon) 
* Change names of libraries for mingw32 boost to 1.49
 2012-09-16 20:26:28 +00:00
Campbell Barton
e84b300d9e use the format attribute in more places, disable X11 options when building with GHOST_SDL 2012-09-16 10:39:19 +00:00
Campbell Barton
c2a1dcf621 fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake. 2012-09-16 01:35:00 +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
Campbell Barton
e75f5c8208 quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc. 
helps for finding unused functions and making functions static, also did some minor code cleanup.
 2012-09-15 01:52:28 +00:00
Sergey Sharybin
c2b9150db2 Disable legacy compositor by default 2012-09-14 15:21:56 +00:00
Lukas Toenne
f7a5569a97 OSL cmake cleanup: 
* Removed unused lib and include directories (also one bad 'src' include that wouldn't work anyway)
* Copied cmake library finding to APPLE and WIN32 sections. These may need some adjustment for their respective OS.
 2012-09-10 08:38:51 +00:00
Lukas Toenne
1352a955ca Cleanup for OSL linking in cmake: Move cmake OSL library search and path definition from the cycles macro file to the top-level CMakeLists.txt. This makes the OSL_LIBRARIES and other variables accessible throughout Blender cmake scripts and especially in the creator module for linking libraries. 2012-09-10 06:18:20 +00:00
Antony Riakiotakis
3793e178f4 Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well. 
This should make MinGW64 builds quite stable again :)
 2012-08-22 00:06:09 +00:00
Campbell Barton
455c37c16b option to build without the legacy compositor 2012-08-19 22:19:19 +00:00
Campbell Barton
47e313ec0c cmake option to build without iksolver 2012-08-18 13:36:29 +00:00
Thomas Dinges
b174610a84 Cmake / Windows: 
* Fix for Boost lib dir when using msvc 2010.
 2012-08-14 19:13:47 +00:00
Thomas Dinges
211d30ea7f Cmake / Windows: 
* Fix for Python include path when using msvc 2010.
 2012-08-14 16:53:40 +00:00
Thomas Dinges
6e939eb2ec Cycles / Cmake: 
* When CUDA building is enabled, build sm_30 kernel as well.
 2012-08-09 12:08:35 +00:00
Jens Verwiebe
17fdc45437 OSX/cmake: refactoring of setting endianess defines, this fixes compile of builds with endianess other than the buildmachine and avoids also failing configuration with xcode 4.4 due not supporting big_endian archs anymore 2012-08-07 13:51:19 +00:00
Jens Verwiebe
9ee3a8655f Fix for fix, now nested 2012-08-07 12:09:48 +00:00
Jens Verwiebe
d4029de0d6 Fix for endiantest, xcode condition interferred with other os 2012-08-07 12:03:43 +00:00
Jens Verwiebe
b9c441536c OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management 2012-08-07 10:02:34 +00:00
Thomas Dinges
ab1badf9a2 Windows MSVC libraries: 
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.
 2012-08-04 20:25:04 +00:00
Thomas Dinges
e0234cc821 Cmake / Windows Libraries: 
* Some more fixes for OpenEXR, works now (tested with cv2008 x64 and x32)
* Some more changes to have libs in lib/win*/libname/vc2010 folder. Commit to libs itself to change that will follow.
 2012-08-04 12:43:45 +00:00
Thomas Dinges
f50bae3259 Revert part of r49504 by Genscher: 
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake.
 2012-08-04 11:39:16 +00:00
Sergey Sharybin
1a5998bc4e Remove old boolean operation module 
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.

Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.

Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
 2012-08-02 16:42:30 +00:00
Daniel Genrich
dc67840db6 OpenEXR: Enable again for MSVC 2010 2012-08-02 14:21:25 +00:00
Antony Riakiotakis
fa92f2fb55 Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW. 2012-07-05 11:39:11 +00:00
Thomas Dinges
6829f613c2 Cmake / Boost: 
* Code cleanup
 2012-07-04 16:39:34 +00:00
Alexander Pinzon
04343ecd8c Windows (msvc 2010) is now using Boost 1.49 - Updated cmake file. 2012-07-04 16:10:22 +00:00
Campbell Barton
7d223a1d14 don't disable cycles when OIIO isnt found, instead throw an error, annoying when full build is done and later find cycles isn't on. 2012-07-01 15:26:25 +00:00
Thomas Dinges
786e4a1014 Cycles / Boost: 
* Windows (msvc 2008) is now using Boost 1.49 - Updated cmake file.
 2012-06-30 18:24:28 +00:00
Campbell Barton
90dc1d1353 the compositor optional for cmake: WITH_COMPOSITOR 2012-06-30 14:14:22 +00:00
Campbell Barton
25f59c8e0b code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE. 
also disable workaround for some linux installs.
 2012-06-28 08:51:02 +00:00
Campbell Barton
3c8a4c458b more guardedalloc use in C++, also make compositorMutex a static var, was allocated and never freed. 2012-06-25 10:35:24 +00:00
Campbell Barton
0c8ebad16e add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed. 2012-06-23 14:23:44 +00:00
Campbell Barton
263be14811 rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate. 2012-06-23 13:42:14 +00:00
Antony Riakiotakis
df0bc84439 Set openjpeg to static. Solves linking issues on recent openjpeg update 2012-06-21 14:44:15 +00:00
Campbell Barton
5248ec57d9 minor fixes 
- new compositor could use uninitialized var
- profile conversion could use uninitialized var
- set better warnings for clang+cmake.
- remove picky warnings from sphinx doc gen shell script.
 2012-06-11 12:13:41 +00:00
Thomas Dinges
0415913740 Cmake: 
* Removed first line, probably accidentally committed in r47439.
 2012-06-06 21:55:55 +00:00