[Bf-blender-cvs] [c3735cc3323] lanpr-under-gp: LineArt: "Match" option in modifier settings.

[YimingWu]

Commit: c3735cc33230730e0a5269825b0f41079dc114f7
Author: YimingWu
Date:   Sun Aug 16 21:52:44 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBc3735cc33230730e0a5269825b0f41079dc114f7

LineArt: "Match" option in modifier settings.

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

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 fea3757a3f6..60f10733919 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -389,18 +389,24 @@ static void occlusion_panel_draw(const bContext *C, Panel 
*panel)
     uiItemR(layout, &ptr, "level_start", 0, "Level", ICON_NONE);
   }
 
-  uiItemR(layout, &ptr, "use_transparency", 0, "Transparency", ICON_NONE);
+  uiLayout *row = uiLayoutRow(layout, false);
+
+  uiItemR(row, &ptr, "use_transparency", 0, "Transparency", ICON_NONE);
+
+  if (use_transparency) {
+    uiItemR(row, &ptr, "transparency_match", 0, "Match", ICON_NONE);
+  }
 
   if (use_transparency) {
-    uiLayout *col = uiLayoutRow(layout, true);
-    uiItemR(col, &ptr, "transparency_mask_0", UI_ITEM_R_TOGGLE, "0", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_1", UI_ITEM_R_TOGGLE, "1", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_2", UI_ITEM_R_TOGGLE, "2", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_3", UI_ITEM_R_TOGGLE, "3", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_4", UI_ITEM_R_TOGGLE, "4", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_5", UI_ITEM_R_TOGGLE, "5", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_6", UI_ITEM_R_TOGGLE, "6", 
ICON_NONE);
-    uiItemR(col, &ptr, "transparency_mask_7", UI_ITEM_R_TOGGLE, "7", 
ICON_NONE);
+    row = uiLayoutRow(layout, true);
+    uiItemR(row, &ptr, "transparency_mask_0", UI_ITEM_R_TOGGLE, "0", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_1", UI_ITEM_R_TOGGLE, "1", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_2", UI_ITEM_R_TOGGLE, "2", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_3", UI_ITEM_R_TOGGLE, "3", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_4", UI_ITEM_R_TOGGLE, "4", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_5", UI_ITEM_R_TOGGLE, "5", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_6", UI_ITEM_R_TOGGLE, "6", 
ICON_NONE);
+    uiItemR(row, &ptr, "transparency_mask_7", UI_ITEM_R_TOGGLE, "7", 
ICON_NONE);
   }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs