[Bf-blender-cvs] [564a378bd1f] blender2.8: Multires: Remove another unused argument from reshape function

[Sergey Sharybin]

Commit: 564a378bd1f43b8d9e78b00675fee27fb98bbc7d
Author: Sergey Sharybin
Date:   Wed Aug 22 16:49:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB564a378bd1f43b8d9e78b00675fee27fb98bbc7d

Multires: Remove another unused argument from reshape function

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

M	source/blender/blenkernel/BKE_multires.h
M	source/blender/blenkernel/intern/multires_reshape.c
M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 14559552da7..d9136846830 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -116,8 +116,11 @@ int mdisp_rot_face_to_crn(struct MVert *mvert, struct MPoly *mpoly, struct MLoop
 
 /* Reshaping, define in multires_reshape.c */
 
-bool multiresModifier_reshape(struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd,
-                              struct Object *dst, struct Object *src);
+bool multiresModifier_reshape(
+        struct Depsgraph *depsgraph,
+        struct MultiresModifierData *mmd,
+        struct Object *dst,
+        struct Object *src);
 bool multiresModifier_reshapeFromDeformModifier(
         struct Depsgraph *depsgraph,
         struct MultiresModifierData *mmd,
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index b1d56ffef1f..f0d97e71a88 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -417,7 +417,6 @@ static bool multires_reshape_from_vertcos(struct Depsgraph *depsgraph,
  */
 bool multiresModifier_reshape(
         struct Depsgraph *UNUSED(depsgraph),
-        Scene *UNUSED(scene),
         MultiresModifierData *UNUSED(mmd),
         Object *UNUSED(dst),
         Object *UNUSED(src))
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 7137583f636..623d8410ddf 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1275,7 +1275,7 @@ static int multires_reshape_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	if (!multiresModifier_reshape(depsgraph, scene, mmd, ob, secondob)) {
+	if (!multiresModifier_reshape(depsgraph, mmd, ob, secondob)) {
 		BKE_report(op->reports, RPT_ERROR, "Objects do not have the same number of vertices");
 		return OPERATOR_CANCELLED;
 	}