[Bf-blender-cvs] [17abae45f13] master: Multires: Cleanup, remove redundant argument

[Sergey Sharybin]

Commit: 17abae45f131a8e97871c0738ec1bac8f836679c
Author: Sergey Sharybin
Date:   Tue Mar 17 14:18:27 2020 +0100
Branches: master
https://developer.blender.org/rB17abae45f131a8e97871c0738ec1bac8f836679c

Multires: Cleanup, remove redundant argument

Scene can be queried from the dependency graph.

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

M	source/blender/blenkernel/BKE_multires.h
M	source/blender/blenkernel/intern/multires.c
M	source/blender/blenkernel/intern/multires_reshape.c

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

diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 4ee255d4e61..c3b1163cd3e 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -91,7 +91,6 @@ int multires_get_level(const struct Scene *scene,
                        bool render,
                        bool ignore_simplify);
 struct Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph,
-                                      struct Scene *scene,
                                       struct MultiresModifierData *mmd,
                                       struct Object *ob);
 void multiresModifier_del_levels(struct MultiresModifierData *mmd,
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 4e97d0fc05c..290bed02913 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -270,13 +270,11 @@ static MDisps *multires_mdisps_initialize_hidden(Mesh *me, int level)
   return mdisps;
 }
 
-Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph,
-                               Scene *scene,
-                               MultiresModifierData *mmd,
-                               Object *ob)
+Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph, MultiresModifierData *mmd, Object *ob)
 {
   Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
-  Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene, ob_eval, &CD_MASK_BAREMESH);
+  Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
+  Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH);
   ModifierEvalContext modifier_ctx = {
       .depsgraph = depsgraph,
       .object = ob_eval,
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index a29398b24a0..657dfcec42f 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -107,11 +107,9 @@ bool multiresModifier_reshapeFromDeformModifier(struct Depsgraph *depsgraph,
   highest_mmd.lvl = highest_mmd.totlvl;
   highest_mmd.renderlvl = highest_mmd.totlvl;
 
-  Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
-
   /* Create mesh for the multires, ignoring any further modifiers (leading
    * deformation modifiers will be applied though). */
-  Mesh *multires_mesh = BKE_multires_create_mesh(depsgraph, scene_eval, &highest_mmd, object);
+  Mesh *multires_mesh = BKE_multires_create_mesh(depsgraph, &highest_mmd, object);
   int num_deformed_verts;
   float(*deformed_verts)[3] = BKE_mesh_vert_coords_alloc(multires_mesh, &num_deformed_verts);