[Bf-blender-cvs] [c950e08cbb0] master: Cleanup: add use prefix for boolean

Campbell Barton noreply at git.blender.org
Mon Mar 8 04:40:15 CET 2021


Commit: c950e08cbb0bb1b53802768a52382c4e6611d9f2
Author: Campbell Barton
Date:   Mon Mar 8 14:39:00 2021 +1100
Branches: master
https://developer.blender.org/rBc950e08cbb0bb1b53802768a52382c4e6611d9f2

Cleanup: add use prefix for boolean

===================================================================

M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_boolean.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 55d81bd3155..4f53a1e6c2b 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2789,7 +2789,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Self", "Allow self-intersection in operands");
   RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
-  prop = RNA_def_property(srna, "hole_tolerant", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_hole_tolerant", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", eBooleanModifierFlag_HoleTolerant);
   RNA_def_property_ui_text(prop, "Hole tolerant", "Better results when there are holes (slower)");
   RNA_def_property_update(prop, 0, "rna_Modifier_update");
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 0bfd0e54304..74a0687e64b 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -876,7 +876,7 @@ static void solver_options_panel_draw(const bContext *UNUSED(C), Panel *panel)
     if (operand_object) {
       uiItemR(col, ptr, "use_self", 0, NULL, ICON_NONE);
     }
-    uiItemR(col, ptr, "hole_tolerant", 0, NULL, ICON_NONE);
+    uiItemR(col, ptr, "use_hole_tolerant", 0, NULL, ICON_NONE);
   }
   else {
     uiItemR(col, ptr, "double_threshold", 0, NULL, ICON_NONE);



More information about the Bf-blender-cvs mailing list