Commit: 474ae3e5f97d98e2d476e8b54bdf4c8ae8ebb9f4 Author: Martin Felke Date: Thu Aug 10 19:21:35 2017 +0200 Branches: fracture_modifier https://developer.blender.org/rB474ae3e5f97d98e2d476e8b54bdf4c8ae8ebb9f4
renamed "Anti-Trigger" to "Stop Trigger" in python and UI now =================================================================== M release/scripts/startup/bl_ui/properties_physics_rigidbody.py M source/blender/makesdna/DNA_rigidbody_types.h M source/blender/makesrna/intern/rna_rigidbody.c =================================================================== diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py index 961fbdc6bf9..cb698661ee7 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -81,7 +81,7 @@ class PHYSICS_PT_rigid_body_trigger_advanced(PHYSICS_PT_rigidbody_panel, Panel): row.prop(rbo, "dynamic_trigger") row = layout.row() row.prop(rbo, "plastic_dissolve") - row.prop(rbo, "is_anti_trigger", text="Stop Trigger") + row.prop(rbo, "stop_trigger") class PHYSICS_PT_rigid_body_collisions(PHYSICS_PT_rigidbody_panel, Panel): bl_label = "Rigid Body Collisions" diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index bc3d06894c1..d6f041c2ab6 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -187,7 +187,7 @@ typedef enum eRigidBodyOb_Flag { RBO_FLAG_DYNAMIC_TRIGGER = (1 << 14), /* dissolve plastic constraints too (if any) */ RBO_FLAG_PLASTIC_DISSOLVE = (1 << 15), - /* anti trigger flag, make simulated objects kinematic again */ + /* anti (stop) trigger flag, make simulated objects kinematic again */ RBO_FLAG_ANTI_TRIGGER = (1 << 16), } eRigidBodyOb_Flag; diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 7dae2028c49..dd3efacffa7 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -1108,9 +1108,9 @@ static void rna_def_rigidbody_object(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dissolve Plastic Constraints", "Dissolves plastic constraints on shards of this trigger target, only relevant for external mode"); RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset"); - prop = RNA_def_property(srna, "is_anti_trigger", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "stop_trigger", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", RBO_FLAG_ANTI_TRIGGER); - RNA_def_property_ui_text(prop, "Anti-Trigger", "Can trigger deactivation of other simulated objects, which are set up to be triggered"); + RNA_def_property_ui_text(prop, "Stop Trigger", "Can trigger deactivation of other simulated objects, which are set up to be triggered"); RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset"); /* Physics Parameters */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs