archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Multires: Remove another unused argument from reshape function

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-22 16:49:05 +02:00
parent b28a74746b
commit 564a378bd1
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/BKE_multires.h
View File

@@ -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,

1
source/blender/blenkernel/intern/multires_reshape.c
View File

@@ -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))

2
source/blender/editors/object/object_modifier.c
View File

@@ -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;
}