archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
86,811 Commits 660 Branches 0 Tags
f604e46780fcffbddec38f94deaaf1299fdb3f00
Commit Graph

1464 Commits

Author SHA1 Message Date
Campbell Barton 0d355a8a2c replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid. 
also replace strcpy's which copy using "" with str[0]='\0'
 2011-09-15 12:26:48 +00:00
Sergey Sharybin 86d05b3144 Update build rules to deal with new gettext libraries. 2011-09-15 11:37:42 +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
Tamito Kajiyama ac796827cb Merged changes in the trunk up to revision 40189. 2011-09-13 22:24:59 +00:00
Campbell Barton ca662d0fd6 svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-12 00:38:57 +00:00
Campbell Barton 3d3f6b1ddc fix for 'blender -E' crashing. 2011-09-11 13:46:58 +00:00
Campbell Barton 75b3936128 svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-10 23:49:39 +00:00
Tamito Kajiyama 353713afe8 Merged changes in the trunk up to revision 40096. 
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt

Note for branch builders: Enabling Blender Player may cause linker errors.
 2011-09-10 13:36:27 +00:00
Campbell Barton fb4abf2e41 fixed linking with CMake 2011-09-10 03:42:45 +00:00
Benoit Bolsee dbd6658d73 svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-07 15:34:04 +00:00
Campbell Barton e74e245030 svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-06 03:16:12 +00:00
Lukas Toenne 8e0fe8bff7 Merged the particles-2010 branch with node improvements into trunk. 
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:

http://wiki.blender.org/index.php/User:Phonybone/Particles2010
 2011-09-05 21:01:50 +00:00
Brecht Van Lommel 27102bfec4 Cycles: OpenCL library is now dynamically loaded so that blender doesn't crash 
if it's not installed on the system.

Code copied from clew.h/clew.c in CLCC:
http://clcc.sourceforge.net/
 2011-09-01 19:00:23 +00:00
Xiao Xiangquan 981f7fcd0d merge with trunk r39834 2011-09-01 15:08:32 +00:00
Brecht Van Lommel d48e4fc92b Cycles: fix linux build issue, link order was wrong. 2011-08-25 12:50:52 +00:00
Brecht Van Lommel 564eae2dc4 Cycles: remove automatic copy of boost/openimageio shared libraries to binary 
folder, this doesn't work well, proper solution is to statically link these in
official builds.
 2011-08-24 13:43:34 +00:00
Brecht Van Lommel 29bdf37f9d Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 09:44:08 +00:00
Campbell Barton fd4575b2e3 svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 02:29:45 +00:00
Tamito Kajiyama 33bb1ed53e Merged changes in the trunk up to revision 39661. 2011-08-24 00:18:26 +00:00
Sergey Sharybin a33a26ca07 FFmpeg library update: 
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
 2011-08-22 18:49:42 +00:00
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
Tamito Kajiyama 9a0b816416 Merged changes in the trunk up to revision 38893. 2011-08-01 20:18:02 +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
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 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