svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27867:27871
authorCampbell Barton <ideasman42@gmail.com>
Wed, 31 Mar 2010 07:28:23 +0000 (07:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 31 Mar 2010 07:28:23 +0000 (07:28 +0000)
commitba627ff40c77c955a203449455494ff0549d5ffa
tree415ffe2c1a053fcba08268ae7633bc5b2f557e8d
parent2910d75f2c68f79054e47348925f13b127ada9d6
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27867:27871
release/scripts/ui/properties_data_modifier.py
source/blender/blenkernel/intern/modifier.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c