kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
30,896 Commits 2 Branches 0 Tags 753 MiB
5b91a783cf
Commit Graph

144 Commits

Author SHA1 Message Date
Xiao Xiangquan
465c3b82fa merge with trunk r39216 2011-08-10 14:32:03 +00:00
Campbell Barton
349c838996 add missing header to cmake files (else some IDE's wont index it) 2011-08-08 05:43:04 +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
fcd7d2b486 NDOF related edits 
- fix for building without NDOF on X11
- quiet some warnings
 2011-08-02 05:52:27 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Campbell Barton
f4293067c1 py api: sphinx doc corrections, pep8 cleanup and style edits, also added __all__ to some modules which were missing it. 2011-07-31 03:15:37 +00:00
Xiao Xiangquan
287b24926f merge with trunk r38787 2011-07-29 17:42:53 +00:00
Nathan Letwory
24def76ac8 svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-29 07:58:03 +00:00
Campbell Barton
2658949752 pep8 cleanup, also print message when attempting to run in animation player mode. 2011-07-29 01:24:03 +00:00
Mike Erwin
6cd4716d1a enable CMake builds with spacenav (contributed by Kevin Cozens) 2011-07-21 21:34:28 +00:00
Campbell Barton
c7532c5b81 update to cmake checker script to also check if our include paths are ok 2011-07-17 12:42:03 +00:00
Xiao Xiangquan
fa46278e34 merge from trunk 38379 2011-07-14 17:29:53 +00:00
Campbell Barton
2c66ab12e9 minor pep8 edits 2011-07-01 12:33:34 +00:00
Campbell Barton
c0a83d24e9 cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug 2011-06-28 02:49:49 +00:00
Campbell Barton
4b1cceddbd fix for building with msvc/cmake take 2 (think its correct this time) 
also sync build flags with scons.
 2011-06-26 17:18:37 +00:00
Campbell Barton
418bce9341 fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug 2011-06-25 14:10:46 +00:00
Xiao Xiangquan
b429af10d0 merge from trunk #37722 2011-06-24 03:30:50 +00:00
Campbell Barton
be94dc10c1 split cmake check configuration out 2011-06-22 05:30:06 +00:00
Campbell Barton
eaae38551f pep8 compliance 2011-06-21 17:17:51 +00:00
Campbell Barton
d33b63c5d8 update cmake checker to ignore file list and add some headers to the source list. 2011-06-21 17:00:34 +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
5e59d0c8bb make better use of cmake builtin funcitons for finding python library/header 2011-06-18 15:15:31 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Campbell Barton
549c2c58a1 added FindSndFile cmake module to replace inline checks. 2011-06-18 12:12:19 +00:00
Campbell Barton
82216030e9 py-api: store frequently used strings as unicode PyObject's to avoid creating/distroying every time. 
also fix for cmake warning
 2011-06-18 08:45:45 +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
04c5f054d8 error in recent commit 2011-06-15 14:00:50 +00:00
Campbell Barton
c02121b708 use full library paths for openexr & msvc, also remove unneeded exr includes 2011-06-15 13:54:57 +00:00
Campbell Barton
bb6e0834e0 cmake: combine debug/optimized into one target_link_libraries() call. 2011-06-15 13:42:02 +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
Campbell Barton
1243992f27 cmake: correct uninitialized vars 2011-06-14 00:24:50 +00:00
Campbell Barton
fedc811014 minor updates to the cmake checker 2011-06-13 03:09:14 +00:00
Campbell Barton
c2e1f3a1e2 fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes. 
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
 2011-06-11 06:00:28 +00:00
Campbell Barton
9cf0bbb95c added a check to console auto-compleation for pythons struct_seq type, so bpy.app and sys.float_info autocompleate their attributes rather then bring treated as a typle. 2011-06-10 09:44:27 +00:00
Campbell Barton
09da9d4393 cmake maintenance 
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
 2011-05-31 01:15:44 +00:00
Campbell Barton
20ae95422e include ffmpeg_compat header in cmake source list. 2011-05-28 04:53:17 +00:00
Campbell Barton
26252bb315 correct spelling error and some pep8 changes. 2011-05-26 09:33:51 +00:00
Campbell Barton
b69c1e8f1a CMake changes 
- don't allow building if the LIBDIR is not found on mac/windows.
- by default use -O2 rather then -O3 for GCC release flags, was crashing some GCC versions and blender releases are supposed to use -O2.
 2011-05-23 14:56:14 +00:00
Campbell Barton
0858904571 fix [#27414] no-material renders differently in View3D vs BGE 
when a texface layer exists this still overrides the default material.
 2011-05-17 02:44:52 +00:00