diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-12 17:30:33 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-12 17:31:04 +0300 |
commit | 61462ab2b41bbd71a98e7a0bc9f9dc9ac5ebdfd9 (patch) | |
tree | 8a8a296e8d50d42758ae34906f7515e6da1cc468 /source | |
parent | 9d0b7babd9af6c0838bbff6d71d3e3f7b24e17b8 (diff) |
Multires: Use more clear naming
There are so many reshapes now, and one more is to come.
Better be explicit.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_multires.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires_reshape.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index d9136846830..92755477d5e 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -116,7 +116,7 @@ int mdisp_rot_face_to_crn(struct MVert *mvert, struct MPoly *mpoly, struct MLoop /* Reshaping, define in multires_reshape.c */ -bool multiresModifier_reshape( +bool multiresModifier_reshapeFromObject( struct Depsgraph *depsgraph, struct MultiresModifierData *mmd, struct Object *dst, diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 5ccd7c0712a..bdd871b5d37 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -435,7 +435,7 @@ static void multires_reshape_init_mmd(MultiresModifierData *reshape_mmd, * This function might fail in cases like source and destination not having * matched amount of vertices. */ -bool multiresModifier_reshape( +bool multiresModifier_reshapeFromObject( struct Depsgraph *depsgraph, MultiresModifierData *mmd, Object *dst, diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 84c2b0d33e5..40f55c81a91 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1274,7 +1274,7 @@ static int multires_reshape_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (!multiresModifier_reshape(depsgraph, mmd, ob, secondob)) { + if (!multiresModifier_reshapeFromObject(depsgraph, mmd, ob, secondob)) { BKE_report(op->reports, RPT_ERROR, "Objects do not have the same number of vertices"); return OPERATOR_CANCELLED; } |