From 173f90c700bb7b0f0b5e4a373ea2d5c259dc2289 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 23 Jan 2018 10:41:25 -0200 Subject: Revert "Grease-Pencil: Icons" This reverts commits: * f0ef3603862 Grease-Pencil: Icons from the grease pencil branch * 13bf4b3804b Grease-Pencil: Fixup for icons * fb8c382fa17 Grease Pencil dat files fix --- source/blender/editors/include/UI_icons.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 088d20170d0..b96be7d8454 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -190,8 +190,8 @@ DEF_ICON(SCULPTMODE_HLT) DEF_ICON(POSE_HLT) DEF_ICON(PARTICLEMODE) DEF_ICON(LIGHTPAINT) -DEF_ICON(GPENCIL_STROKE_PAINT) #ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK063) DEF_ICON(BLANK064) DEF_ICON(BLANK065) DEF_ICON(BLANK066) @@ -313,8 +313,8 @@ DEF_ICON(OUTLINER_OB_SURFACE) DEF_ICON(OUTLINER_OB_SPEAKER) DEF_ICON(OUTLINER_OB_FORCE_FIELD) DEF_ICON(OUTLINER_OB_GROUP_INSTANCE) -DEF_ICON(OUTLINER_OB_GPENCIL) #ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK122) DEF_ICON(BLANK123) DEF_ICON(BLANK124) DEF_ICON(BLANK125) @@ -344,8 +344,8 @@ DEF_ICON(OUTLINER_DATA_FONT) DEF_ICON(OUTLINER_DATA_SURFACE) DEF_ICON(OUTLINER_DATA_SPEAKER) DEF_ICON(OUTLINER_DATA_POSE) -DEF_ICON(OUTLINER_DATA_GPENCIL) #ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK130) DEF_ICON(BLANK131) DEF_ICON(BLANK132) DEF_ICON(BLANK133) @@ -713,8 +713,8 @@ DEF_ICON(CLIPUV_DEHLT) DEF_ICON(CLIPUV_HLT) DEF_ICON(SNAP_PEEL_OBJECT) DEF_ICON(GRID) -DEF_ICON(OBJECT_ORIGIN) #ifndef DEF_ICON_BLANK_SKIP + DEF_ICON(BLANK221) DEF_ICON(BLANK222) DEF_ICON(BLANK224) DEF_ICON(BLANK225) -- cgit v1.2.3