[Bf-blender-cvs] [e1e7e021b2f] temp-lineart-contained: LineArt: Partial UI fixes for modifier and object panels.

YimingWu noreply at git.blender.org
Fri Apr 16 15:54:23 CEST 2021


Commit: e1e7e021b2fa20f09c0e6899edf0fcd5481c2c1f
Author: YimingWu
Date:   Fri Apr 16 21:53:42 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBe1e7e021b2fa20f09c0e6899edf0fcd5481c2c1f

LineArt: Partial UI fixes for modifier and object panels.

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

M	release/scripts/startup/bl_ui/properties_object.py
M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 033e6196323..fbb827aece4 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -327,9 +327,11 @@ class OBJECT_PT_lineart(ObjectButtonsPanel, Panel):
         layout.prop(lineart, "usage")
         layout.use_property_split = True
 
-        row = layout.row(heading="Override Crease")
-        row.prop(lineart, "use_crease_override", text="")
-        row.prop(lineart, "crease_threshold", slider=True, text="")
+        row = layout.row()
+        row.prop(lineart, "use_crease_override", text="Override Crease")
+        row = layout.row()
+        row.active = lineart.use_crease_override
+        row.prop(lineart, "crease_threshold", slider=True, text="Threshold")
 
 
 class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel):
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 080a3caa32f..a2f35c8e575 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -335,7 +335,7 @@ static void occlusion_panel_draw(const bContext *UNUSED(C), Panel *panel)
   if (use_multiple_levels) {
     uiLayout *col = uiLayoutColumn(layout, true);
     uiItemR(col, ptr, "level_start", 0, NULL, ICON_NONE);
-    uiItemR(col, ptr, "level_end", 0, NULL, ICON_NONE);
+    uiItemR(col, ptr, "level_end", 0, IFACE_("End"), ICON_NONE);
   }
   else {
     uiItemR(layout, ptr, "level_start", 0, IFACE_("Level"), ICON_NONE);
@@ -367,7 +367,7 @@ static void transparency_panel_draw(const bContext *UNUSED(C), Panel *panel)
 
   uiLayout *row = uiLayoutRow(layout, true);
   uiLayoutSetPropDecorate(row, false);
-  uiLayout *sub = uiLayoutRow(row, true);
+  uiLayout *sub = uiLayoutRowWithHeading(row, true, IFACE_("Masks"));
   char text[2] = "0";
 
   PropertyRNA *prop = RNA_struct_find_property(ptr, "use_transparency_mask");



More information about the Bf-blender-cvs mailing list