diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2015-02-27 14:11:49 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2015-02-28 12:09:55 +0300 |
| commit | 8bb3e2a3ea49fa9886897458720ac5acf299624e (patch) | |
| tree | 4c97d9f0f12da05a55fa50f6ebd4ecfad8230c33 /source/blender/makesrna/intern/rna_object.c | |
| parent | b00fecc85da19a25be571c6541dd76ea268af19d (diff) | |
gameengine physics: moving collision filtering inside the collision panel and relabeling some parts
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 51c011e474e..d8aa659b68e 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1633,7 +1633,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) {OB_BODY_TYPE_DYNAMIC, "DYNAMIC", 0, "Dynamic", "Linear physics"}, {OB_BODY_TYPE_RIGID, "RIGID_BODY", 0, "Rigid Body", "Linear and angular physics"}, {OB_BODY_TYPE_SOFT, "SOFT_BODY", 0, "Soft Body", "Soft body"}, - {OB_BODY_TYPE_OCCLUDER, "OCCLUDE", 0, "Occlude", "Occluder for optimizing scene rendering"}, + {OB_BODY_TYPE_OCCLUDER, "OCCLUDER", 0, "Occluder", "Occluder for optimizing scene rendering"}, {OB_BODY_TYPE_SENSOR, "SENSOR", 0, "Sensor", "Collision Sensor, detects static and dynamic objects but not the other " "collision sensor objects"}, @@ -1834,7 +1834,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "collision_boundtype"); RNA_def_property_enum_items(prop, collision_bounds_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Object_collision_bounds_itemf"); - RNA_def_property_ui_text(prop, "Collision Bounds", "Select the collision type"); + RNA_def_property_ui_text(prop, "Collision Shape", "Select the collision shape that better fits the object"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "use_collision_compound", PROP_BOOLEAN, PROP_NONE); |