Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-08-16 13:47:22 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-08-16 15:42:06 +0300
commit642c6d2fc94b3aadf3c44fddd3e62f98684f2a63 (patch)
treecad2b15eaf82df9eb4b4d013c091e3d5c8c68d0d /source/blender/blenkernel/intern/multires.c
parentc58de2f632e78fc8241e2eb30ab952ea777af71c (diff)
Multires: Cleanup, naming and bool type
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index ab0327652cd..b4fd93afba1 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -427,16 +427,18 @@ int multiresModifier_reshape(struct Depsgraph *depsgraph, Scene *scene, Multires
return multiresModifier_reshapeFromDM(depsgraph, scene, mmd, dst, srcdm);
}
-int multiresModifier_reshapeFromDeformMod(struct Depsgraph *depsgraph, Scene *scene, MultiresModifierData *mmd,
- Object *ob, ModifierData *md)
+bool multiresModifier_reshapeFromDeformModifier(
+ struct Depsgraph *depsgraph, Scene *scene, MultiresModifierData *mmd,
+ Object *ob, ModifierData *md)
{
DerivedMesh *dm, *ndm;
- int numVerts, result;
+ int numVerts;
float (*deformedVerts)[3];
const ModifierEvalContext mectx = {depsgraph, ob, 0};
- if (multires_get_level(scene, ob, mmd, false, true) == 0)
- return 0;
+ if (multires_get_level(scene, ob, mmd, false, true) == 0) {
+ return false;
+ }
/* Create DerivedMesh for deformation modifier */
dm = get_multires_dm(depsgraph, scene, mmd, ob);
@@ -453,7 +455,7 @@ int multiresModifier_reshapeFromDeformMod(struct Depsgraph *depsgraph, Scene *sc
dm->release(dm);
/* Reshaping */
- result = multiresModifier_reshapeFromDM(depsgraph, scene, mmd, ob, ndm);
+ bool result = (multiresModifier_reshapeFromDM(depsgraph, scene, mmd, ob, ndm) != 0);
/* Cleanup */
ndm->release(ndm);