svn merge ^/trunk/blender -r47070:47099
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 May 2012 04:48:42 +0000 (04:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 May 2012 04:48:42 +0000 (04:48 +0000)
commitdaa8fe9145295bcf1acc7f0e50ef698f9eb64095
treeb65c861a741457bff7e64b5ae8b52c4f1769a429
parentaab3f71b9db40f9d5b14ae86727bb64c2de3d827
parent492d7ace57fbb405a4881ebce01d2f0358fe2e64
svn merge ^/trunk/blender -r47070:47099
13 files changed:
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt