[Bf-blender-cvs] [0cb25a51de5] master: UI: Line Art: Always use Material icon on picker

Pablo Vazquez noreply at git.blender.org
Mon Jul 26 00:16:19 CEST 2021


Commit: 0cb25a51de5feb46be387073771e021f28f33c28
Author: Pablo Vazquez
Date:   Sun Jul 25 23:59:53 2021 +0200
Branches: master
https://developer.blender.org/rB0cb25a51de5feb46be387073771e021f28f33c28

UI: Line Art: Always use Material icon on picker

The Material picker shouldn't change icon based on it's state,
it should always display the Material icon.

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

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 bc6a9e53f11..33e766a7315 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -320,13 +320,8 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
   }
   uiLayout *row = uiLayoutRow(layout, true);
   uiLayoutSetRedAlert(row, !material_valid);
-  uiItemPointerR(row,
-                 ptr,
-                 "target_material",
-                 &obj_data_ptr,
-                 "materials",
-                 NULL,
-                 material_valid ? ICON_SHADING_TEXTURE : ICON_ERROR);
+  uiItemPointerR(
+      row, ptr, "target_material", &obj_data_ptr, "materials", NULL, ICON_SHADING_TEXTURE);
 
   gpencil_modifier_panel_end(layout, ptr);
 }



More information about the Bf-blender-cvs mailing list