[Bf-blender-cvs] [2c3ba5ef643] greasepencil-object: Cleanup: Rename icon identifier

[Antonio Vazquez]

Commit: 2c3ba5ef6436c354b36ddd3f174357127eaf13bb
Author: Antonio Vazquez
Date:   Fri Jul 7 16:59:41 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2c3ba5ef6436c354b36ddd3f174357127eaf13bb

Cleanup: Rename icon identifier

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

M	source/blender/editors/include/UI_icons.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 7aa4c88c8da..0d828cdbac9 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -715,7 +715,7 @@ DEF_ICON(CLIPUV_DEHLT)
 DEF_ICON(CLIPUV_HLT)
 DEF_ICON(SNAP_PEEL_OBJECT)
 DEF_ICON(GRID)
-DEF_ICON(OBJ_ORIGIN)
+DEF_ICON(OBJECT_ORIGIN)
 #ifndef DEF_ICON_BLANK_SKIP
 	DEF_ICON(BLANK222)
 	DEF_ICON(BLANK224)
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index d6bde2dbe4f..4c33936d6fe 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3506,7 +3506,7 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	};
 	
 	static EnumPropertyItem gpencil_stroke_placement_items[] = {
-		{GP_PROJECT_VIEWSPACE, "ORIGIN", ICON_OBJ_ORIGIN, "Origin", "Draw stroke at Object origin"},
+		{GP_PROJECT_VIEWSPACE, "ORIGIN", ICON_OBJECT_ORIGIN, "Origin", "Draw stroke at Object origin"},
 		{GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" },
 		// {0, "VIEW", ICON_VISIBLE_IPO_ON, "View", "Stick stroke to the view "}, /* weird, GP_PROJECT_VIEWALIGN is inverted */
 		{GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_VIEW, "SURFACE", ICON_FACESEL, "Surface", "Stick stroke to surfaces"},