sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
8925ed1420
blender/source/creator
History
Tamito Kajiyama 8925ed1420 Merged changes in the trunk up to revision 46557. 
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
2012-05-11 22:48:41 +00:00
..
buildinfo.c remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
CMakeLists.txt Merged changes in the trunk up to revision 46557. 2012-05-11 22:48:41 +00:00
creator.c Merged changes in the trunk up to revision 46557. 2012-05-11 22:48:41 +00:00
SConscript Shuffle some build code around to ensure debug builds on Windows actually run too. 2011-06-08 11:53:07 +00:00