svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 00:31:00 +0000 (00:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 00:31:00 +0000 (00:31 +0000)
commitc64336390569a344f972ce41d8a1fb96d3c9c38f
treeca5d281e088c2024e536f3a832c9606f99e46bc3
parent5a3c6ccadb8925d6e2b1da2b2861de35b33f939f
parentbf5a6531a61638b74b9e80e055e00c2b97483fdf
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesrna/RNA_access.h
source/blender/modifiers/CMakeLists.txt