From 10b83a94d9b6b1cad07af78ed237a3d3a0dc6418 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 30 Oct 2019 05:30:38 +1100 Subject: Cleanup: use "use_" prefix for booleans --- release/scripts/startup/bl_ui/properties_data_mesh.py | 8 ++++---- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 8 ++++---- source/blender/makesrna/intern/rna_mesh.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 51f24007271..c854eaa0d14 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -477,10 +477,10 @@ class DATA_PT_remesh(MeshButtonsPanel, Panel): if (mesh.remesh_mode == 'VOXEL'): col.prop(mesh, "remesh_voxel_size") col.prop(mesh, "remesh_voxel_adaptivity") - col.prop(mesh, "remesh_fix_poles") - col.prop(mesh, "remesh_smooth_normals") - col.prop(mesh, "remesh_preserve_volume") - col.prop(mesh, "remesh_preserve_paint_mask") + col.prop(mesh, "use_remesh_fix_poles") + col.prop(mesh, "use_remesh_smooth_normals") + col.prop(mesh, "use_remesh_preserve_volume") + col.prop(mesh, "use_remesh_preserve_paint_mask") col.operator("object.voxel_remesh", text="Voxel Remesh") else: col.operator("object.quadriflow_remesh", text="QuadriFlow Remesh") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c6972b15432..92cbc540ec1 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1235,10 +1235,10 @@ class VIEW3D_PT_sculpt_voxel_remesh(Panel, View3DPaintPanel): mesh = context.active_object.data col.prop(mesh, "remesh_voxel_size") col.prop(mesh, "remesh_voxel_adaptivity") - col.prop(mesh, "remesh_fix_poles") - col.prop(mesh, "remesh_smooth_normals") - col.prop(mesh, "remesh_preserve_volume") - col.prop(mesh, "remesh_preserve_paint_mask") + col.prop(mesh, "use_remesh_fix_poles") + col.prop(mesh, "use_remesh_smooth_normals") + col.prop(mesh, "use_remesh_preserve_volume") + col.prop(mesh, "use_remesh_preserve_paint_mask") col.operator("object.voxel_remesh", text="Remesh") # TODO, move to space_view3d.py diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index cc01554f73a..5890c3fe8a2 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -3006,17 +3006,17 @@ static void rna_def_mesh(BlenderRNA *brna) "generating triangles. A value greater than 0 disables Fix Poles"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); - prop = RNA_def_property(srna, "remesh_smooth_normals", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_remesh_smooth_normals", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_REMESH_SMOOTH_NORMALS); RNA_def_property_ui_text(prop, "Smooth Normals", "Smooth the normals of the remesher result"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); - prop = RNA_def_property(srna, "remesh_fix_poles", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_remesh_fix_poles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_REMESH_FIX_POLES); RNA_def_property_ui_text(prop, "Fix Poles", "Produces less poles and a better topology flow"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); - prop = RNA_def_property(srna, "remesh_preserve_volume", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_remesh_preserve_volume", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_REMESH_REPROJECT_VOLUME); RNA_def_property_ui_text( prop, @@ -3024,7 +3024,7 @@ static void rna_def_mesh(BlenderRNA *brna) "Projects the mesh to preserve the volume and details of the original mesh"); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); - prop = RNA_def_property(srna, "remesh_preserve_paint_mask", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_remesh_preserve_paint_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_REMESH_REPROJECT_PAINT_MASK); RNA_def_property_boolean_default(prop, false); RNA_def_property_ui_text(prop, "Preserve Paint Mask", "Keep the current mask on the new mesh"); -- cgit v1.2.3