[Bf-blender-cvs] [da373c1f0d5] master: GPencil: Rename functions to annotation prefix

Antonioya noreply at git.blender.org
Tue Mar 19 11:04:03 CET 2019


Commit: da373c1f0d51717625172eb4daad48310efd20f1
Author: Antonioya
Date:   Tue Mar 19 10:52:37 2019 +0100
Branches: master
https://developer.blender.org/rBda373c1f0d51717625172eb4daad48310efd20f1

GPencil: Rename functions to annotation prefix

This code was used only in annotations.

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

M	source/blender/editors/gpencil/annotate_draw.c
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/editors/render/render_opengl.c

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

diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c
index 111a24da528..8a72702505c 100644
--- a/source/blender/editors/gpencil/annotate_draw.c
+++ b/source/blender/editors/gpencil/annotate_draw.c
@@ -1133,7 +1133,7 @@ void ED_gpencil_draw_view3d_annotations(
 	gp_draw_data_all(scene, gpd, offsx, offsy, winx, winy, CFRA, dflag, v3d->spacetype);
 }
 
-void ED_gpencil_draw_ex(
+void ED_annotation_draw_ex(
 	Scene *scene, bGPdata *gpd,
 	int winx, int winy, const int cfra, const char spacetype)
 {
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 12677769527..4c2ffa01bcc 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -157,7 +157,7 @@ void ED_gpencil_draw_view3d_object(
         struct View3D *v3d,
         struct ARegion *ar,
         bool only3d);
-void ED_gpencil_draw_ex(
+void ED_annotation_draw_ex(
         struct Scene *scene,
         struct bGPdata *gpd, int winx, int winy,
         const int cfra, const char spacetype);
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 7fb9dbdf3a6..84b84f1dd52 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -325,7 +325,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R
 			GPU_matrix_translate_2f(sizex / 2, sizey / 2);
 
 			G.f |= G_FLAG_RENDER_VIEWPORT;
-			ED_gpencil_draw_ex(
+			ED_annotation_draw_ex(
 			        scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ);
 			G.f &= ~G_FLAG_RENDER_VIEWPORT;



More information about the Bf-blender-cvs mailing list