svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 08:08:31 +0000 (08:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 08:08:31 +0000 (08:08 +0000)
commit24c936947735c74227684b7c5594c68c4cfdded8
tree9b45d3b8defdd95167b7d4e4d290de9a22fa0ef7
parent3debc930e8d32f8136180947e9cf5fc5e5bced05
parent9f1966425f207a3fb84c3a2a4399633c0978e486
svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c