diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 16:36:49 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 16:36:49 +0300 |
commit | 0ba0993f18c135f260a8278a911185452011fea4 (patch) | |
tree | 4463c50e403116c17f1753cd8100cd9aa076a306 /source/blender/editors/physics/physics_fluid.c | |
parent | 95ccaed9e652f20a97d0a4d63ac3c9825944c897 (diff) |
Depsgraph: Port more areas to direct depsgraph API
This is a lots of changes, but they are boiling down to a simple API
changes where we are no longer relying on implicit usage of scene's
depsgraph and pass depsgraph explicitly.
There should be no user measurable difference, render_layer* tests
are also passing.
Diffstat (limited to 'source/blender/editors/physics/physics_fluid.c')
-rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 060ac046ba1..a5e92802c6f 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -332,6 +332,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid { Scene *scene = CTX_data_scene(C); SceneLayer *sl = CTX_data_scene_layer(C); + Depsgraph *depsgraph = CTX_data_depsgraph(C); EvaluationContext eval_ctx; Base *base; int i; @@ -408,7 +409,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid /* Modifying the global scene isn't nice, but we can do it in * this part of the process before a threaded job is created */ scene->r.cfra = (int)eval_time; - ED_update_for_newframe(CTX_data_main(C), scene); + ED_update_for_newframe(CTX_data_main(C), scene, depsgraph); /* now scene data should be current according to animation system, so we fill the channels */ @@ -846,6 +847,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor { Scene *scene = CTX_data_scene(C); SceneLayer *sl = CTX_data_scene_layer(C); + Depsgraph *depsgraph = CTX_data_depsgraph(C); int i; FluidsimSettings *domainSettings; @@ -957,7 +959,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor /* reset to original current frame */ scene->r.cfra = origFrame; - ED_update_for_newframe(CTX_data_main(C), scene); + ED_update_for_newframe(CTX_data_main(C), scene, depsgraph); /* ******** init domain object's matrix ******** */ copy_m4_m4(domainMat, fsDomain->obmat); |