[Bf-blender-cvs] [de6d6e171e9] master: Cleanup: Remove commented code
Hans Goudey
noreply at git.blender.org
Wed Mar 17 19:54:35 CET 2021
Commit: de6d6e171e950ab59e8499f310a91ee7fc18c9f8
Author: Hans Goudey
Date: Wed Mar 17 14:54:30 2021 -0400
Branches: master
https://developer.blender.org/rBde6d6e171e950ab59e8499f310a91ee7fc18c9f8
Cleanup: Remove commented code
Mistake in earlier commit rBbe33d3eccdcdf252. Also use const and
set layouts disabled when the line art is baked.
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 67563c5679f..2170e486416 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -295,9 +295,8 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
static void style_panel_draw(const bContext *UNUSED(C), Panel *panel)
{
- PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
-
uiLayout *layout = panel->layout;
+ PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
const bool is_baked = RNA_boolean_get(ptr, "is_baked");
@@ -311,9 +310,8 @@ static void style_panel_draw(const bContext *UNUSED(C), Panel *panel)
static void occlusion_panel_draw(const bContext *UNUSED(C), Panel *panel)
{
- PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
-
uiLayout *layout = panel->layout;
+ PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
const bool is_baked = RNA_boolean_get(ptr, "is_baked");
@@ -339,6 +337,9 @@ static void transparency_panel_draw_header(const bContext *UNUSED(C), Panel *pan
uiLayout *layout = panel->layout;
PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
+ const bool is_baked = RNA_boolean_get(ptr, "is_baked");
+ uiLayoutSetEnabled(layout, !is_baked);
+
uiItemR(layout, ptr, "use_transparency", 0, IFACE_("Transparency"), ICON_NONE);
}
@@ -347,6 +348,9 @@ static void transparency_panel_draw(const bContext *UNUSED(C), Panel *panel)
uiLayout *layout = panel->layout;
PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
+ const bool is_baked = RNA_boolean_get(ptr, "is_baked");
+ uiLayoutSetEnabled(layout, !is_baked);
+
uiLayoutSetPropSep(layout, true);
uiLayoutSetActive(layout, RNA_boolean_get(ptr, "use_transparency"));
@@ -365,7 +369,6 @@ static void transparency_panel_draw(const bContext *UNUSED(C), Panel *panel)
uiItemL(row, "", ICON_BLANK1); /* Space for decorator. */
uiLayout *col = uiLayoutColumn(layout, true);
- // uiLayoutSetPropDecorate(col, true);
uiItemR(col, ptr, "transparency_match", 0, IFACE_("Match All Masks"), ICON_NONE);
}
@@ -400,7 +403,7 @@ static void vgroup_panel_draw(const bContext *UNUSED(C), Panel *panel)
uiLayout *layout = panel->layout;
- bool is_baked = RNA_boolean_get(ptr, "is_baked");
+ const bool is_baked = RNA_boolean_get(ptr, "is_baked");
uiLayoutSetPropSep(layout, true);
uiLayoutSetEnabled(layout, !is_baked);
@@ -413,7 +416,7 @@ static void vgroup_panel_draw(const bContext *UNUSED(C), Panel *panel)
uiItemR(col, ptr, "match_output_vertex_group", 0, NULL, ICON_NONE);
- bool match_output = RNA_boolean_get(ptr, "match_output_vertex_group");
+ const bool match_output = RNA_boolean_get(ptr, "match_output_vertex_group");
if (!match_output) {
uiItemPointerR(
col, ptr, "vertex_group", &ob_ptr, "vertex_groups", IFACE_("Target"), ICON_NONE);
@@ -428,7 +431,7 @@ static void baking_panel_draw(const bContext *UNUSED(C), Panel *panel)
PointerRNA ob_ptr;
PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, &ob_ptr);
- bool is_baked = RNA_boolean_get(ptr, "is_baked");
+ const bool is_baked = RNA_boolean_get(ptr, "is_baked");
uiLayoutSetPropSep(layout, true);
More information about the Bf-blender-cvs
mailing list