Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
47,173 Commits 2 Branches 0 Tags
8f486bdadc5824456c96d352d837ad0b7275f936
Commit Graph

519 Commits

Author SHA1 Message Date
Brecht Van Lommel
360fcd73fe Cycles: 
* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
  and hopefully more useful error message
 2011-08-16 16:15:34 +00:00
Xiao Xiangquan
5293b4f498 some small fix 2011-08-13 14:43:52 +00:00
Brecht Van Lommel
84d917dc6c Cycles: clean up some unnecessary changes compared to trunk. 2011-08-12 18:29:21 +00:00
Xiao Xiangquan
b99f7af357 remove gettext from mkaesrna, and update language packs 2011-08-11 22:14:07 +00:00
Brecht Van Lommel
ec26abd2db Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-07 13:21:04 +00:00
Xiao Xiangquan
16deef9e79 small fix of building rules 2011-08-07 11:50:48 +00:00
Xiao Xiangquan
66d1707293 fix of cmake rules for mac, from sirdude 2011-07-30 14:05:48 +00:00
Xiao Xiangquan
287b24926f merge with trunk r38787 2011-07-29 17:42:53 +00:00
Campbell Barton
fc95382a97 svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 03:55:23 +00:00
Campbell Barton
cadfac5a0f svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 17:51:30 +00:00
Xiao Xiangquan
8454f2b8b3 complete the language-select feature 2011-07-25 17:05:43 +00:00
Campbell Barton
2dc6b8f835 svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 14:34:36 +00:00
Campbell Barton
a7815053ef svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender 
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
 2011-07-25 12:59:54 +00:00
Campbell Barton
97d0846d2c svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-24 13:03:48 +00:00
Tamito Kajiyama
ce03ec4b86 Merged changes in the trunk up to revision 38543. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
 2011-07-20 23:33:10 +00:00
Campbell Barton
3a6158a8bf move mathutils into its own lib. 2011-07-15 04:01:47 +00:00
Xiao Xiangquan
fa46278e34 merge from trunk 38379 2011-07-14 17:29:53 +00:00
Campbell Barton
3ee2cb9cdb fix for error in cmake files 2011-07-02 07:55:06 +00:00
Campbell Barton
cf05777bc0 cmake was installing text as a directory rather then coping the files within it. 2011-07-01 13:10:49 +00:00
Brecht Van Lommel
d18d37d25f Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-28 15:00:42 +00:00
Tamito Kajiyama
d65ebf8c84 Merged changes in the trunk up to revision 37799. 
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies.  Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
 2011-06-25 00:49:53 +00:00
Xiao Xiangquan
b429af10d0 merge from trunk #37722 2011-06-24 03:30:50 +00:00
Campbell Barton
1309f17103 cmake was installing .bfont.ttf in ~/.blender/VER/config, use ~/.blender/VER instead (as with scons) 2011-06-22 08:43:01 +00:00
Brecht Van Lommel
07dee0d8a6 Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk 2011-06-21 15:47:18 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Tamito Kajiyama
17ee056fc6 Merged changes in the trunk up to revision 37539. 
Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py.  This
problem resulted in empty menus in the GUI.
 2011-06-16 05:50:13 +00:00
Xiao Xiangquan
40981d872f merge from trunk r37405 2011-06-15 08:28:56 +00:00
Xiao Xiangquan
12f0795d49 accident when merge. revert to r37405 2011-06-11 18:15:46 +00:00
Xiao Xiangquan
2d3795ab3c merge from trunk r37405 2011-06-11 12:48:13 +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
Tamito Kajiyama
32c7e22d36 Merged changes in the trunk up to revision 37388. 
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
 2011-06-11 00:22:10 +00:00
Campbell Barton
f122a74b1e svn merge -r37078:37335 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-09 15:20:29 +00:00
Brecht Van Lommel
c5e63925db Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-06-09 14:53:25 +00:00
Nick Samarin
5ceb8b3d35 synched with trunk at revision 37212 2011-06-05 18:51:00 +00:00
Campbell Barton
4a59928484 CMake option 'WITH_HEADLESS' to build blender in headless mode (no x11/xlib) with NULL ghost classe. 2011-06-04 14:12:55 +00:00
Xiao Xiangquan
a40e1302ae Almost complete the i18n system, including: 
Copy unifont..ttf.gz from source tree to target datafile path( now ONLY works with cmake );
Set the locale the same with system's setting;
If need unicode font, unzip and load unifont when init ui styles;
Apply gettext() to labels in space_info.py, who are the main menu items.

Each of these should have been commit one by one. As they work well according to my tests, so I just lazily send a long list.
 2011-06-02 11:22:22 +00:00
Brecht Van Lommel
6a128eee7b Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-05-31 09:51:46 +00:00
Campbell Barton
08d6932c86 svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-31 05:11:04 +00:00
Campbell Barton
35cbb3ed49 svn merge -r36840:36890 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-31 02:55:29 +00:00
Campbell Barton
5a3aaf1fd1 cmake formatting adjustment, no functional change. 2011-05-30 10:51:37 +00:00
Campbell Barton
b92e6985cf fix for cmakes windows install target, was extracting python 4 times, note install(CODE... doesnt support CONFIGURATIONS setting. 2011-05-30 10:39:18 +00:00
Campbell Barton
e6d396d17d fix for installing blender as a python module with cmake. 2011-05-26 12:15:42 +00:00
Campbell Barton
514de547ac update to build system excluding parts of the python bundle. 2011-05-26 11:45:25 +00:00
Campbell Barton
3cfa9a2163 cmake's install target now works for the python module on *nix. 2011-05-24 18:34:07 +00:00
Campbell Barton
dc33976fc2 fix for cmake/msvc when the path name contains spaces, patch by Kupoman on IRC 2011-05-24 05:21:51 +00:00
Tamito Kajiyama
dfcd015535 Merged changes in the trunk up to revision 36757. 2011-05-19 01:40:37 +00:00
Brecht Van Lommel
88d9d89c97 Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-05-18 13:56:20 +00:00
Nick Samarin
a918040902 synched with trunk at revision 36569 2011-05-16 20:30:59 +00:00
Campbell Barton
33bfcb26b8 manually copy more changes from trunk. 2011-05-12 09:02:39 +00:00
Campbell Barton
191ad54599 svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-12 05:35:19 +00:00