diff options
| author | Campbell Barton <campbell@blender.org> | 2022-03-16 03:58:22 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-03-16 03:58:22 +0300 |
| commit | be7855591e3b47e5e72c09555946f75975a8c028 (patch) | |
| tree | eb11ff27360e2285cddfe24609bc293b103e9ac0 /intern | |
| parent | 379bd6d50ce37e07cbc4fb1e1c47c814f6a7530e (diff) | |
Cleanup: rename cnt to count
Follow naming from T85728.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/itasc/Scene.cpp | 6 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/fluid_script.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/intern/itasc/Scene.cpp b/intern/itasc/Scene.cpp index b5f8e4df386..7bbfc3a87f2 100644 --- a/intern/itasc/Scene.cpp +++ b/intern/itasc/Scene.cpp @@ -270,7 +270,7 @@ bool Scene::initialize() m_ytask.resize(m_ncTotal); bool toggle = true; - int cnt = 0; + int count = 0; // Initialize all ConstraintSets: for (ConstraintMap::iterator it = constraints.begin(); it != constraints.end(); ++it) { // Calculate the external pose: @@ -279,8 +279,8 @@ bool Scene::initialize() getConstraintPose(cs->task, cs, external_pose); result &= cs->task->initialise(external_pose); cs->task->initCache(m_cache); - for (int i = 0; i < cs->constraintrange.count; i++, cnt++) { - m_ytask[cnt] = toggle; + for (int i = 0; i < cs->constraintrange.count; i++, count++) { + m_ytask[count] = toggle; } toggle = !toggle; project(m_Cf, cs->constraintrange, cs->featurerange) = cs->task->getCf(); diff --git a/intern/mantaflow/intern/strings/fluid_script.h b/intern/mantaflow/intern/strings/fluid_script.h index 48e0c243e16..548606f1b32 100644 --- a/intern/mantaflow/intern/strings/fluid_script.h +++ b/intern/mantaflow/intern/strings/fluid_script.h @@ -739,13 +739,13 @@ file_format_data = '$CACHE_DATA_FORMAT$'\n\ file_format_mesh = '$CACHE_MESH_FORMAT$'\n\ \n\ # How many frame to load from cache\n\ -from_cache_cnt = 100\n\ +from_cache_count = 100\n\ \n\ -loop_cnt = 0\n\ +loop_count = 0\n\ while current_frame_s$ID$ <= end_frame_s$ID$:\n\ \n\ # Load already simulated data from cache:\n\ - if loop_cnt < from_cache_cnt:\n\ + if loop_count < from_cache_count:\n\ load_data(current_frame_s$ID$, cache_resumable)\n\ \n\ # Otherwise simulate new data\n\ @@ -756,7 +756,7 @@ while current_frame_s$ID$ <= end_frame_s$ID$:\n\ step(current_frame_s$ID$)\n\ \n\ current_frame_s$ID$ += 1\n\ - loop_cnt += 1\n\ + loop_count += 1\n\ \n\ if gui:\n\ gui.pause()\n"; |