[Bf-blender-cvs] [b2303f16777] temp-gpencil-eval: GPencil: Cleanup - Make function static

[Antonio Vazquez]

Commit: b2303f16777ef47028a849351df9e708da0f6ce5
Author: Antonio Vazquez
Date:   Fri Jan 17 16:34:03 2020 +0100
Branches: temp-gpencil-eval
https://developer.blender.org/rBb2303f16777ef47028a849351df9e708da0f6ce5

GPencil: Cleanup - Make function static

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

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/blenkernel/intern/gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 0bc599556a2..3397a68c5c6 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -109,7 +109,6 @@ struct bGPDstroke *BKE_gpencil_stroke_duplicate(struct bGPDstroke *gps_src);
 
 void BKE_gpencil_copy_data(struct bGPdata *gpd_dst, const struct bGPdata *gpd_src, const int flag);
 struct bGPdata *BKE_gpencil_copy(struct Main *bmain, const struct bGPdata *gpd);
-struct bGPdata *BKE_gpencil_copy_for_eval(struct bGPdata *gpd, bool reference);
 
 struct bGPdata *BKE_gpencil_data_duplicate(struct Main *bmain,
                                            const struct bGPdata *gpd,
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 95b3ff5a1f8..ef1bd42eabd 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -688,19 +688,6 @@ bGPdata *BKE_gpencil_copy(Main *bmain, const bGPdata *gpd)
   return gpd_copy;
 }
 
-bGPdata *BKE_gpencil_copy_for_eval(bGPdata *gpd, bool reference)
-{
-  int flags = LIB_ID_COPY_LOCALIZE;
-
-  if (reference) {
-    flags |= LIB_ID_COPY_CD_REFERENCE;
-  }
-
-  bGPdata *result;
-  BKE_id_copy_ex(NULL, &gpd->id, (ID **)&result, flags);
-  return result;
-}
-
 /* make a copy of a given gpencil datablock */
 /* XXX: Should this be deprecated? */
 bGPdata *BKE_gpencil_data_duplicate(Main *bmain, const bGPdata *gpd_src, bool internal_copy)
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 454b826e2a5..b9787fba7f2 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -878,6 +878,19 @@ static void gpencil_copy_activeframe_to_eval(
   }
 }
 
+static bGPdata *gpencil_copy_for_eval(bGPdata *gpd, bool reference)
+{
+  int flags = LIB_ID_COPY_LOCALIZE;
+
+  if (reference) {
+    flags |= LIB_ID_COPY_CD_REFERENCE;
+  }
+
+  bGPdata *result;
+  BKE_id_copy_ex(NULL, &gpd->id, (ID **)&result, flags);
+  return result;
+}
+
 void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
   bGPdata *gpd_eval = (bGPdata *)ob->data;
@@ -909,7 +922,7 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o
       ob->data = ob->runtime.gpd_orig;
     }
 
-    ob->runtime.gpd_eval = BKE_gpencil_copy_for_eval(ob->runtime.gpd_orig, true);
+    ob->runtime.gpd_eval = gpencil_copy_for_eval(ob->runtime.gpd_orig, true);
     gpencil_assign_object_eval(ob);
     BKE_gpencil_update_orig_pointers(ob_orig, (Object *)ob);
   }