diff options
author | Julian Eisel <julian@blender.org> | 2022-06-30 19:36:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-06-30 19:38:44 +0300 |
commit | 65166e145b4d6292abc289b71894c53b25c186ba (patch) | |
tree | 707513038d00a964d7a400ac8e7e22251fffb02d /source/blender/blenkernel/intern/pointcache.c | |
parent | 66de653784ab06ccea46413de6b2f086b5a69d30 (diff) |
Cleanup: Remove scene frame macros (`CFRA` et al.)
Removes the following macros for scene/render frame values:
- `CFRA`
- `SUBFRA`
- `SFRA`
- `EFRA`
These macros don't add much, other than saving a few characters when typing.
It's not immediately clear what they refer to, they just hide what they
actually access. Just be explicit and clear about that.
Plus these macros gave read and write access to the variables, so eyesores like
this would be done (eyesore because it looks like assigning to a constant):
```
CFRA = some_frame_nbr;
```
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D15311
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 21217a7f9bf..5d8025dce8a 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2920,7 +2920,7 @@ int BKE_ptcache_id_reset(Scene *scene, PTCacheID *pid, int mode) BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0); } else if (after) { - BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_AFTER, CFRA); + BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_AFTER, scene->r.cfra); } return (reset || clear || after); @@ -3162,8 +3162,8 @@ void BKE_ptcache_bake(PTCacheBaker *baker) PTCacheID *pid = &baker->pid; PointCache *cache = NULL; float frameleno = scene->r.framelen; - int cfrao = CFRA; - int startframe = MAXFRAME, endframe = baker->anim_init ? scene->r.sfra : CFRA; + int cfrao = scene->r.cfra; + int startframe = MAXFRAME, endframe = baker->anim_init ? scene->r.sfra : scene->r.cfra; int bake = baker->bake; int render = baker->render; @@ -3270,7 +3270,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) } } - CFRA = startframe; + scene->r.cfra = startframe; scene->r.framelen = 1.0; /* bake */ @@ -3282,21 +3282,21 @@ void BKE_ptcache_bake(PTCacheBaker *baker) stime = ptime = PIL_check_seconds_timer(); - for (int fr = CFRA; fr <= endframe; fr += baker->quick_step, CFRA = fr) { + for (int fr = scene->r.cfra; fr <= endframe; fr += baker->quick_step, scene->r.cfra = fr) { BKE_scene_graph_update_for_newframe(depsgraph); if (baker->update_progress) { - float progress = ((float)(CFRA - startframe) / (float)(endframe - startframe)); + float progress = ((float)(scene->r.cfra - startframe) / (float)(endframe - startframe)); baker->update_progress(baker->bake_job, progress, &cancel); } if (G.background) { - printf("bake: frame %d :: %d\n", CFRA, endframe); + printf("bake: frame %d :: %d\n", scene->r.cfra, endframe); } else { ctime = PIL_check_seconds_timer(); - fetd = (ctime - ptime) * (endframe - CFRA) / baker->quick_step; + fetd = (ctime - ptime) * (endframe - scene->r.cfra) / baker->quick_step; if (use_timer || fetd > 60.0) { use_timer = true; @@ -3307,7 +3307,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) printf("Baked for %s, current frame: %i/%i (%.3fs), ETC: %s\r", run, - CFRA - startframe + 1, + scene->r.cfra - startframe + 1, endframe - startframe + 1, ctime - ptime, etd); @@ -3321,7 +3321,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) break; } - CFRA += 1; + scene->r.cfra += 1; } if (use_timer) { @@ -3330,7 +3330,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) printf("\nBake %s %s (%i frames simulated).\n", (cancel ? "canceled after" : "finished in"), run, - CFRA - startframe); + scene->r.cfra - startframe); } /* clear baking flag */ @@ -3379,7 +3379,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) } scene->r.framelen = frameleno; - CFRA = cfrao; + scene->r.cfra = cfrao; if (bake) { /* already on cfra unless baking */ BKE_scene_graph_update_for_newframe(depsgraph); |