diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-22 08:39:35 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-22 08:39:35 +0400 |
| commit | aa267976b86f90423204e11a30eec4e0def0f296 (patch) | |
| tree | e1b09c017eef0191473b9aa1e59fd08ffe705f43 /source/blender/makesrna/intern/rna_world.c | |
| parent | f1fb09a493b79e6320a651a035203dff98c3b580 (diff) | |
| parent | 1efffc1f564af0597512699890d7be9f41a6aee2 (diff) | |
NLA SoC: Merge from 2.5
21043 to 21072
(NOTE TO SELF: Campbell made a commit in 2.5 before this merge finished)
Diffstat (limited to 'source/blender/makesrna/intern/rna_world.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_world.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index 4dba61411f0..f5eb81e3cea 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -337,7 +337,7 @@ void RNA_def_world(BlenderRNA *brna) static EnumPropertyItem physics_engine_items[] = { {WOPHY_NONE, "NONE", 0, "None", ""}, //{WOPHY_ENJI, "ENJI", 0, "Enji", ""}, - {WOPHY_SUMO, "SUMO", 0, "Sumo (Deprecated)", ""}, + //{WOPHY_SUMO, "SUMO", 0, "Sumo (Deprecated)", ""}, //{WOPHY_DYNAMO, "DYNAMO", 0, "Dynamo", ""}, //{WOPHY_ODE, "ODE", 0, "ODE", ""}, {WOPHY_BULLET, "BULLET", 0, "Bullet", ""}, |