[Bf-blender-cvs] [d10688dcee6] greasepencil-object: Cleanup: Rename function

[Antonio Vazquez]

Commit: d10688dcee6091ba65d4c51755162a777acff6d1
Author: Antonio Vazquez
Date:   Sun May 6 12:02:11 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd10688dcee6091ba65d4c51755162a777acff6d1

Cleanup: Rename function

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

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c

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

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index fb7c13aa31e..a9a6aa7540d 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -58,9 +58,9 @@ void BKE_gpencil_free_point_weights(struct bGPDspoint *pt);
 void BKE_gpencil_free_stroke_weights(struct bGPDstroke *gps);
 void BKE_gpencil_free_stroke(struct bGPDstroke *gps);
 bool BKE_gpencil_free_strokes(struct bGPDframe *gpf);
-bool BKE_gpencil_free_layer_temp_data(struct bGPDframe *derived_gpf);
 void BKE_gpencil_free_frames(struct bGPDlayer *gpl);
 void BKE_gpencil_free_layers(struct ListBase *list);
+bool BKE_gpencil_free_frame_temp_data(struct bGPDframe *derived_gpf);
 void BKE_gpencil_free_derived_frames(struct bGPdata *gpd);
 void BKE_gpencil_free(struct bGPdata *gpd, bool free_all);
 
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 74f16cd07e2..e7b1daf8453 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -144,7 +144,7 @@ bool BKE_gpencil_free_strokes(bGPDframe *gpf)
 }
 
 /* Free strokes and colors belonging to a gp-frame */
-bool BKE_gpencil_free_layer_temp_data(bGPDframe *derived_gpf)
+bool BKE_gpencil_free_frame_temp_data(bGPDframe *derived_gpf)
 {
 	bGPDstroke *gps_next;
 	if (!derived_gpf) {
@@ -214,7 +214,7 @@ static void BKE_gpencil_clear_derived(bGPDlayer *gpl)
 	GHASH_ITER(gh_iter, gpl->derived_data) {
 		bGPDframe *gpf = (bGPDframe *)BLI_ghashIterator_getValue(&gh_iter);
 		if (gpf) {
-			BKE_gpencil_free_layer_temp_data(gpf);
+			BKE_gpencil_free_frame_temp_data(gpf);
 		}
 	}
 }
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 849ccfd7918..4de17b7fa1d 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -1000,7 +1000,7 @@ void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene
 		if (cache->is_dirty) {
 			if (derived_gpf != NULL) {
 				/* first clear temp data */
-				BKE_gpencil_free_layer_temp_data(derived_gpf);
+				BKE_gpencil_free_frame_temp_data(derived_gpf);
 				BLI_ghash_remove(gpl->derived_data, ob->id.name, NULL, NULL);
 			}
 			/* create new data */