[Bf-blender-cvs] [8949dd6cb64] master: Cleanup: correct name for scene frame conversion

[Campbell Barton]

Commit: 8949dd6cb64a240e322f31c00df9118e86d3a47d
Author: Campbell Barton
Date:   Fri Aug 2 19:25:43 2019 +1000
Branches: master
https://developer.blender.org/rB8949dd6cb64a240e322f31c00df9118e86d3a47d

Cleanup: correct name for scene frame conversion

Thanks to @sybren for pointing out issue from 299ff91ea1fe5

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

M       source/blender/blenkernel/BKE_scene.h
M       source/blender/blenkernel/intern/particle.c
M       source/blender/blenkernel/intern/pointcache.c
M       source/blender/blenkernel/intern/scene.c
M       source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenkernel/BKE_scene.h 
b/source/blender/blenkernel/BKE_scene.h
index eafb91c85e1..83477a71d17 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -135,7 +135,7 @@ int BKE_scene_frame_snap_by_seconds(struct Scene *scene, 
double interval_in_seco
 bool BKE_scene_validate_setscene(struct Main *bmain, struct Scene *sce);
 
 float BKE_scene_frame_get(const struct Scene *scene);
-float BKE_scene_frame_get_from_ctime(const struct Scene *scene, const float 
frame);
+float BKE_scene_frame_to_ctime(const struct Scene *scene, const float frame);
 void BKE_scene_frame_set(struct Scene *scene, double cfra);
 
 struct TransformOrientationSlot 
*BKE_scene_orientation_slot_get_from_flag(struct Scene *scene,
diff --git a/source/blender/blenkernel/intern/particle.c 
b/source/blender/blenkernel/intern/particle.c
index 64616af945f..9cc49e39231 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3559,7 +3559,7 @@ ModifierData *object_add_particle_system(Main *bmain, 
Scene *scene, Object *ob,
 
   psys->totpart = 0;
   psys->flag = PSYS_CURRENT;
-  psys->cfra = BKE_scene_frame_get_from_ctime(scene, CFRA + 1);
+  psys->cfra = BKE_scene_frame_to_ctime(scene, CFRA + 1);
 
   DEG_relations_tag_update(bmain);
   DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
diff --git a/source/blender/blenkernel/intern/pointcache.c 
b/source/blender/blenkernel/intern/pointcache.c
index bf33e076e32..90ae512074d 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -3559,7 +3559,7 @@ void BKE_ptcache_id_time(
 
   if (timescale) {
     time = BKE_scene_frame_get(scene);
-    nexttime = BKE_scene_frame_get_from_ctime(scene, CFRA + 1.0f);
+    nexttime = BKE_scene_frame_to_ctime(scene, CFRA + 1.0f);
 
     *timescale = MAX2(nexttime - time, 0.0f);
   }
diff --git a/source/blender/blenkernel/intern/scene.c 
b/source/blender/blenkernel/intern/scene.c
index a447b828bb1..b582b4f54bd 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1347,11 +1347,11 @@ bool BKE_scene_validate_setscene(Main *bmain, Scene 
*sce)
  */
 float BKE_scene_frame_get(const Scene *scene)
 {
-  return BKE_scene_frame_get_from_ctime(scene, scene->r.cfra);
+  return BKE_scene_frame_to_ctime(scene, scene->r.cfra);
 }
 
 /* This function is used to obtain arbitrary fractional frames */
-float BKE_scene_frame_get_from_ctime(const Scene *scene, const float frame)
+float BKE_scene_frame_to_ctime(const Scene *scene, const float frame)
 {
   float ctime = frame;
   ctime += scene->r.subframe;
diff --git a/source/blender/makesrna/intern/rna_scene.c 
b/source/blender/makesrna/intern/rna_scene.c
index fd8791cf193..9af9895d461 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -877,7 +877,7 @@ static float rna_Scene_frame_current_final_get(PointerRNA 
*ptr)
 {
   Scene *scene = (Scene *)ptr->data;
 
-  return BKE_scene_frame_get_from_ctime(scene, (float)scene->r.cfra);
+  return BKE_scene_frame_to_ctime(scene, (float)scene->r.cfra);
 }
 
 static void rna_Scene_start_frame_set(PointerRNA *ptr, int value)

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