[Bf-blender-cvs] [4ca18ac8cd3] greasepencil-object: Set icon for Brush enum

[Antonio Vazquez]

Commit: 4ca18ac8cd37da00f45d11836c9cc81d8303022e
Author: Antonio Vazquez
Date:   Tue Jul 10 11:53:34 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB4ca18ac8cd37da00f45d11836c9cc81d8303022e

Set icon for Brush enum

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

M       source/blender/makesrna/intern/rna_brush.c

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

diff --git a/source/blender/makesrna/intern/rna_brush.c 
b/source/blender/makesrna/intern/rna_brush.c
index 190e80d93e4..bc3ca43b537 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -498,8 +498,7 @@ static const EnumPropertyItem 
*rna_DynamicGpencil_type_itemf(
                item_tmp.identifier = brush->id.name;
                item_tmp.name = brush->id.name;
                item_tmp.value = i;
-               /* GPXX: Set icon here ??*/
-               item_tmp.icon = ICON_NONE;
+               item_tmp.icon = brush->gpencil_settings->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