[Bf-blender-cvs] [1d5db1cf435] greasepencil-object: Icon names fixes after last merge

[Dalai Felinto]

Commit: 1d5db1cf435466f21898712f0f5385a137a55537
Author: Dalai Felinto
Date:   Tue Jan 23 12:10:14 2018 -0200
Branches: greasepencil-object
https://developer.blender.org/rB1d5db1cf435466f21898712f0f5385a137a55537

Icon names fixes after last merge

Bonus: Fix tooltip of GP object

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/editors/animation/anim_channels_defines.c
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3fafcd3583a..c32091aa399 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1365,7 +1365,7 @@ class INFO_MT_add(Menu):
         layout.menu("INFO_MT_armature_add", icon='OUTLINER_OB_ARMATURE')
         layout.operator("object.add", text="Lattice", icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
         layout.operator_menu_enum("object.empty_add", "type", text="Empty", icon='OUTLINER_OB_EMPTY')
-        layout.operator_menu_enum("object.gpencil_add", "type", text="GPencil", icon='OUTLINER_OB_GPENCIL')
+        layout.operator_menu_enum("object.gpencil_add", "type", text="GPencil", icon='OUTLINER_OB_GREASEPENCIL')
         layout.separator()
 
         layout.operator("object.speaker_add", text="Speaker", icon='OUTLINER_OB_SPEAKER')
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 0729d136116..2d695593c7b 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -225,7 +225,7 @@ class VIEW3D_PT_tools_add_object(View3DPanel, Panel):
         layout.operator("object.armature_add", text="Armature", icon='OUTLINER_OB_ARMATURE')
         layout.operator("object.add", text="Lattice", icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
         layout.operator("object.empty_add", text="Empty", icon='OUTLINER_OB_EMPTY').type = 'PLAIN_AXES'
-        layout.operator("object.gpencil_add", text="Gpencil", icon='OUTLINER_OB_GPENCIL')
+        layout.operator("object.gpencil_add", text="Gpencil", icon='OUTLINER_OB_GREASEPENCIL')
         layout.operator("object.speaker_add", text="Speaker", icon='OUTLINER_OB_SPEAKER')
         layout.operator("object.camera_add", text="Camera", icon='OUTLINER_OB_CAMERA')
 
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 8885917137f..73a4f96f47c 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -657,7 +657,7 @@ static int acf_object_icon(bAnimListElem *ale)
 		case OB_EMPTY: 
 			return ICON_OUTLINER_OB_EMPTY;
 		case OB_GPENCIL:
-			return ICON_OUTLINER_OB_GPENCIL;
+			return ICON_OUTLINER_OB_GREASEPENCIL;
 		default:
 			return ICON_OBJECT_DATA;
 	}
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index bec4675136c..11944f4a524 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1179,7 +1179,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 				case OB_EMPTY:
 					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
 				case OB_GPENCIL:
-					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_GPENCIL); break; 
+					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_GREASEPENCIL); break;
 			}
 		}
 		else {
@@ -1255,7 +1255,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 				case ID_LS:
 					tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break;
 				case ID_GD:
-					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_GPENCIL); break;
+					tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_GREASEPENCIL); break;
 				default:
 					break;
 			}
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 1a222ce1795..cda51e45ad1 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -90,7 +90,7 @@ const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = {
 };
 
 const EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
-	{ GP_EMPTY, "EMPTY", ICON_OUTLINER_OB_GPENCIL, "GP Object", "" },
+	{ GP_EMPTY, "EMPTY", ICON_OUTLINER_OB_GREASEPENCIL, "GP Object", "" },
 	{ GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "" },
 	{ 0, NULL, 0, NULL, NULL }
 };