Commit: 21eda8c460152e1908250122584a04dd19bd6141 Author: Antonio Vazquez Date: Thu Apr 16 15:51:41 2020 +0200 Branches: greasepencil-object https://developer.blender.org/rB21eda8c460152e1908250122584a04dd19bd6141
GPencil: Display preview icon in material select =================================================================== M release/scripts/startup/bl_ui/properties_grease_pencil_common.py M source/blender/editors/gpencil/gpencil_utils.c =================================================================== diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 6b9e41db12a..3492f7a4973 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -386,8 +386,8 @@ class GPENCIL_MT_material_active(Menu): for slot in ob.material_slots: mat = slot.material if mat: - layout.operator("gpencil.material_set", text=mat.name, - icon='MATERIAL' if mat == mat_active else 'BLANK1').slot = mat.name + icon = mat.id_data.preview.icon_id + layout.operator("gpencil.material_set", text=mat.name, icon_value=icon).slot = mat.name class GPENCIL_MT_gpencil_draw_delete(Menu): diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 76fee890e03..bd76839adf8 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -504,13 +504,7 @@ const EnumPropertyItem *ED_gpencil_material_enum_itemf(bContext *C, item_tmp.identifier = ma->id.name + 2; item_tmp.name = ma->id.name + 2; item_tmp.value = i; - - if (i == ob->actcol) { - item_tmp.icon = ICON_MATERIAL; - } - else { - item_tmp.icon = ICON_NONE; - } + item_tmp.icon = ma->preview->icon_id; RNA_enum_item_add(&item, &totitem, &item_tmp); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs