Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-04-24 18:14:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-24 18:14:54 +0400
commitb18ef3b8fb0836a7da900ee8458761027d0bc10f (patch)
treedf6cdadd1f47ea629e8378c54f26b94c7dc273a4
parent2cfbabc9b87e6749f66471e5801024c19c99316e (diff)
use more rna-constant name for bevel clamping.
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py2
-rw-r--r--source/blender/makesrna/intern/rna_modifier.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 85447d4f183..d42bfa066fe 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -124,7 +124,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
split = layout.split()
split.prop(md, "use_only_vertices")
- split.prop(md, "overlap_ok")
+ split.prop(md, "use_clamp_overlap")
layout.label(text="Limit Method:")
layout.row().prop(md, "limit_method", expand=True)
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 4b5e08065d6..ef997ab1fd9 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2365,9 +2365,9 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
RNA_def_property_string_funcs(prop, NULL, NULL, "rna_BevelModifier_defgrp_name_set");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop = RNA_def_property(srna, "overlap_ok", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flags", BME_BEVEL_OVERLAP_OK);
- RNA_def_property_ui_text(prop, "Allow Overlap", "Do not clamp the width to avoid overlap");
+ prop = RNA_def_property(srna, "use_clamp_overlap", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "flags", BME_BEVEL_OVERLAP_OK);
+ RNA_def_property_ui_text(prop, "Clamp Overlap", "Clamp the width to avoid overlap");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
#endif