[Bf-blender-cvs] [588f2d29441] blender-v2.82-release: Fix T72970: [Mantaflow] When changing the domain settings, the current frame of the scene is set to 1

[Sebastián Barschkis]

Commit: 588f2d294413f14951811126cd9b0c6c4fa5ec72
Author: Sebastián Barschkis
Date:   Wed Jan 15 18:55:40 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB588f2d294413f14951811126cd9b0c6c4fa5ec72

Fix T72970: [Mantaflow] When changing the domain settings, the current frame of the scene is set to 1

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

M	source/blender/editors/physics/physics_fluid.c
M	source/blender/makesrna/intern/rna_fluid.c

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

diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 9cc26920251..64dd461fb4e 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -475,7 +475,6 @@ static void fluid_free_startjob(void *customdata, short *stop, short *do_update,
 {
   FluidJob *job = customdata;
   FluidDomainSettings *mds = job->mmd->domain;
-  Scene *scene = job->scene;
 
   job->stop = stop;
   job->do_update = do_update;
@@ -512,9 +511,6 @@ static void fluid_free_startjob(void *customdata, short *stop, short *do_update,
   *do_update = true;
   *stop = 0;
 
-  /* Reset scene frame to cache frame start */
-  CFRA = mds->cache_frame_start;
-
   /* Update scene so that viewport shows freed up scene */
   ED_update_for_newframe(job->bmain, job->depsgraph);
 }
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 2e7170a32d6..a6625ebf552 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -81,7 +81,6 @@ static void rna_Fluid_resetCache(Main *UNUSED(bmain), Scene *scene, PointerRNA *
                                           FLUID_DOMAIN_OUTDATED_NOISE |
                                           FLUID_DOMAIN_OUTDATED_MESH |
                                           FLUID_DOMAIN_OUTDATED_PARTICLES);
-    scene->r.cfra = settings->cache_frame_start;
   }
   DEG_id_tag_update(ptr->owner_id, ID_RECALC_GEOMETRY);
 }