Campbell Barton
7d316b70b8
rename NAN_BUILDINFO --> WITH_BUILDINFO
2011-08-22 16:54:26 +00:00
Campbell Barton
817273931a
buildinfo is now quoted from the build systems, avoids stripping quotes on startup.
...
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
2011-08-22 12:24:14 +00:00
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
Xiao Xiangquan
465c3b82fa
merge with trunk r39216
2011-08-10 14:32:03 +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
73dde4e26f
svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-29 02:03:53 +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
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
794f3291fe
svn merge -r38200:38300 https://svn.blender.org/svnroot/bf-blender/trunk/blender , source/blender/gpu/intern/gpu_buffers.c updated from trunk and re-made edits to use getTessFace* functions.
2011-07-26 03:00:55 +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
cc0abf9963
svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 16:12:54 +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
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
80eb1eae42
run WM_exit(C) when blender as a python module exits
2011-07-10 18:54:02 +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
8ddd2db648
RenderEngine API: add self.report() error reporting function for render engines,
...
works the same as for operators. Also includes some refactoring of render error
reporting code to use ReportList.
2011-06-28 16:25:07 +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
Campbell Barton
12e02fd474
own patch [ #27752 ] Python Callback (Scriptlink functionality)
...
Python:
* adds bpy.app.handlers which contains lists, each for an event type:
render_pre, render_post, load_pre, load_post, save_pre, save_post
* each list item needs to be a callable object which takes 1 argument (the ID).
* callbacks are cleared on file load.
Example:
def MyFunc(scene): print("Callback:", data)
bpy.app.handlers.render_post.append(MyFunc)
C:
* This patch adds a generic C callback api which is currently only used by python.
* Unlike python callbacks these are not cleared on file load.
2011-06-24 16:54:30 +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
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
Campbell Barton
eeba877926
fix [ #27607 ] Scene's render.filepath gets cropped to 159 characters
...
use 240 char limit, remove backbuffer path which wasn't used.
2011-06-10 10:13:50 +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
Nathan Letwory
899f2776db
Shuffle some build code around to ensure debug builds on Windows actually run too.
...
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
2011-06-08 11:53:07 +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
M.G. Kishalmi
9b5800bcd7
fixed "rather then" -> "rather than" typos all over the place
2011-05-28 13:11:24 +00:00