[Bf-blender-cvs] [b186698d9bc] greasepencil-object: Cleanup: Prefix all exported functions with module prefix

[Joshua Leung]

Commit: b186698d9bcbd649aa67ba925e9431d0de9432f7
Author: Joshua Leung
Date:   Wed Jan 31 14:23:04 2018 +1300
Branches: greasepencil-object
https://developer.blender.org/rBb186698d9bcbd649aa67ba925e9431d0de9432f7

Cleanup: Prefix all exported functions with module prefix

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

M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 2a77f61f1e2..51879fde5ac 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -953,7 +953,7 @@ const EnumPropertyItem *ED_gpencil_brushes_enum_itemf(
 				item_tmp.icon = ICON_GPBRUSH_FILL;
 			}
 			else {
-				item_tmp.icon = gpencil_get_brush_icon(brush->icon);
+				item_tmp.icon = ED_gpencil_get_brush_icon(brush->icon);
 			}
 		else
 			item_tmp.icon = ICON_NONE;
@@ -1516,7 +1516,7 @@ void gp_stroke_convertcoords_tpoint(Scene *scene, ARegion *ar, View3D *v3d,
 }
 
 /* helper to get brush icon */
-int gpencil_get_brush_icon(int type)
+int ED_gpencil_get_brush_icon(int type)
 {
 	switch (type) {
 		case GPBRUSH_CUSTOM:
@@ -1547,4 +1547,4 @@ int gpencil_get_brush_icon(int type)
 			return ICON_GPBRUSH_CUSTOM;
 			break;
 	}
-}
\ No newline at end of file
+}
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 242084a8fe7..c05a3ff049f 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -222,6 +222,6 @@ void ED_gpencil_vgroup_deselect(struct bContext *C, struct Object *ob);
 int ED_gpencil_join_objects_exec(struct bContext *C, struct wmOperator *op);
 
 /* helper to get brush icon */
-int gpencil_get_brush_icon(int type);
+int ED_gpencil_get_brush_icon(int type);
 
 #endif /*  __ED_GPENCIL_H__ */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 268f0dc0690..61d3fa64fb6 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -656,7 +656,7 @@ static const EnumPropertyItem *rna_GPencilBrush_enum_itemf(
 			item_tmp.icon = ICON_GPBRUSH_FILL;
 		}
 		else {
-			item_tmp.icon = gpencil_get_brush_icon(brush->icon);
+			item_tmp.icon = ED_gpencil_get_brush_icon(brush->icon);
 		}
 
 		RNA_enum_item_add(&item, &totitem, &item_tmp);