[Bf-blender-cvs] [0e3ac25] GPencil_EditStrokes: GPencil UI: Use the icons defined in RNA
Joshua Leung
noreply at git.blender.org
Sun Oct 12 13:54:00 CEST 2014
Commit: 0e3ac25de0bc6b19119fa658960055a78c5d0ffd
Author: Joshua Leung
Date: Sun Oct 12 19:35:30 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rB0e3ac25de0bc6b19119fa658960055a78c5d0ffd
GPencil UI: Use the icons defined in RNA
===================================================================
M source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 0acff8f..a1715ed 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -150,8 +150,7 @@ static void gp_drawui_layer(uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl, cons
uiButSetFunc(but, gp_ui_activelayer_cb, gpd, gpl);
/* locked */
- icon = (gpl->flag & GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED;
- uiItemR(sub, &ptr, "lock", 0, "", icon);
+ uiItemR(sub, &ptr, "lock", 0, "", ICON_NONE);
/* when layer is locked or hidden, only draw header */
if (gpl->flag & (GP_LAYER_LOCKED | GP_LAYER_HIDE)) {
@@ -159,7 +158,7 @@ static void gp_drawui_layer(uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl, cons
/* visibility button (only if hidden but not locked!) */
if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
- uiItemR(sub, &ptr, "hide", 0, "", ICON_RESTRICT_VIEW_ON);
+ uiItemR(sub, &ptr, "hide", 0, "", ICON_NONE);
/* name */
if (gpl->flag & GP_LAYER_HIDE)
@@ -184,7 +183,7 @@ static void gp_drawui_layer(uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl, cons
else {
/* draw rest of header -------------------------------- */
/* visibility button */
- uiItemR(sub, &ptr, "hide", 0, "", ICON_RESTRICT_VIEW_OFF);
+ uiItemR(sub, &ptr, "hide", 0, "", ICON_NONE);
/* frame locking */
/* TODO: this needs its own icons... */
More information about the Bf-blender-cvs
mailing list