diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-04-02 18:51:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-04-02 18:51:44 +0300 |
| commit | 1d365374e81a6ba402858e48acd9adadf54b7b92 (patch) | |
| tree | 14fbcd877f7a1835a687aa9a58156539eab2e9aa /source/blender/makesrna/intern/rna_constraint.c | |
| parent | 96de11c2c67e332dc0d303210fd1fddbb532c5ca (diff) | |
| parent | 4c2b79a1d5a6302c96b9be6aa1e4dc2bab50e414 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/makesrna/intern/rna_constraint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 16cd103b772..4c6c7740ff8 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -2656,9 +2656,10 @@ void RNA_def_constraint(BlenderRNA *brna) /* TODO: setting this to true must ensure that all others in stack are turned off too... */ prop = RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_ACTIVE); - RNA_def_property_ui_text(prop, "Active", "Constraint is the one being edited "); + RNA_def_property_ui_text(prop, "Active", "Constraint is the one being edited"); prop = RNA_def_property(srna, "is_proxy_local", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_PROXY_LOCAL); RNA_def_property_ui_text(prop, "Proxy Local", "Constraint was added in this proxy instance (i.e. did not belong to source Armature)"); |