[Bf-blender-cvs] [41957200b9a] greasepencil-object: Rename BKE_gpencil_free_frame_temp_data to BKE_gpencil_free_frame_runtime_data

[Antonio Vazquez]

Commit: 41957200b9ae9f4321512a54aaeeef15f66ab4bb
Author: Antonio Vazquez
Date:   Fri May 11 16:19:53 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB41957200b9ae9f4321512a54aaeeef15f66ab4bb

Rename BKE_gpencil_free_frame_temp_data to BKE_gpencil_free_frame_runtime_data

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

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 6c86aff5085..3fd24716ee0 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -60,7 +60,7 @@ void BKE_gpencil_free_stroke(struct bGPDstroke *gps);
 bool BKE_gpencil_free_strokes(struct bGPDframe *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);
+bool BKE_gpencil_free_frame_runtime_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 3f005384e07..707e8db4793 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_frame_temp_data(bGPDframe *derived_gpf)
+bool BKE_gpencil_free_frame_runtime_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_frame_temp_data(gpf);
+                       BKE_gpencil_free_frame_runtime_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 2139a846274..a86f27e49d5 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_frame_temp_data(derived_gpf);
+                               
BKE_gpencil_free_frame_runtime_data(derived_gpf);
                                BLI_ghash_remove(gpl->derived_data, 
ob->id.name, NULL, NULL);
                        }
                        /* create new data */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs