svn merge ^/trunk/blender -r44118:44136
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 18:32:08 +0000 (18:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 18:32:08 +0000 (18:32 +0000)
commit78f9bb6e913c6c87080c9bf1a91712d83a415154
tree4dd8f90a0b0c37cfab7ed98195809bbff8348be6
parent576ce5928f184b4f78dc0b48fdb8726cf320047b
parent93526b4c72f76f8d8d382a11e7d0f8e4f21c4a7c
svn merge ^/trunk/blender -r44118:44136
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c