[Bf-blender-cvs] [4ef1b6e7170] sculpt-mode-features: Remove old mask opacity control and property

Pablo Dobarro noreply at git.blender.org
Sun Jun 30 01:13:05 CEST 2019


Commit: 4ef1b6e71707c8977fe15a3a2ed60ac8505f3f46
Author: Pablo Dobarro
Date:   Sun Jun 30 01:13:41 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB4ef1b6e71707c8977fe15a3a2ed60ac8505f3f46

Remove old mask opacity control and property

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

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index bb289c23970..ae658a8c29d 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1191,8 +1191,6 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
         col.prop(sculpt, "show_diffuse_color")
         col = flow.column()
         col.prop(sculpt, "show_mask")
-        col = flow.column()
-        col.prop(sculpt, "mask_opacity")
 
 
 class VIEW3D_PT_sculpt_options_unified(Panel, View3DPaintPanel):
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index b9669473161..b96b34a88b7 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -969,12 +969,11 @@ typedef struct Sculpt {
   /* Direction used for SCULPT_OT_symmetrize operator */
   int symmetrize_direction;
 
+  char _pad[4];
+
   /* gravity factor for sculpting */
   float gravity_factor;
 
-  /* mask opacity */
-  float mask_opacity;
-
   /* scale for constant detail size */
   /** Constant detail resolution (Blender unit / constant_detail). */
   float constant_detail;
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index c6dbb9c7ea8..221d4375970 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -840,14 +840,6 @@ static void rna_def_sculpt(BlenderRNA *brna)
   RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
   RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Sculpt_ShowMask_update");
 
-  prop = RNA_def_property(srna, "mask_opacity", PROP_FLOAT, PROP_FACTOR);
-  RNA_def_property_float_sdna(prop, NULL, "mask_opacity");
-  RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 2);
-  RNA_def_property_float_default(prop, 1.0f);
-  RNA_def_property_ui_text(prop, "Mask Opacity", "Opacitiy of the sculpt mask");
-  RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
-  RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Sculpt_update");
-
   prop = RNA_def_property(srna, "detail_size", PROP_FLOAT, PROP_PIXEL);
   RNA_def_property_ui_range(prop, 0.5, 40.0, 10, 2);
   RNA_def_property_ui_text(



More information about the Bf-blender-cvs mailing list