griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Multires: Cleanup, naming and bool type

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-16 12:47:22 +02:00
parent c58de2f632
commit 642c6d2fc9
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,8 +95,9 @@ int multiresModifier_reshape(struct Depsgraph *depsgraph, struct Scene *scene, s
struct Object *dst, struct Object *src);
int multiresModifier_reshapeFromDM(struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd,
struct Object *ob, struct DerivedMesh *srcdm);
int multiresModifier_reshapeFromDeformMod(struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd,
struct Object *ob, struct ModifierData *md);
bool multiresModifier_reshapeFromDeformModifier(
struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd,
struct Object *ob, struct ModifierData *md);
void multires_stitch_grids(struct Object *);

14
source/blender/blenkernel/intern/multires.c
View File

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

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

@@ -605,7 +605,7 @@ static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scen
multires_force_update(ob);
if (mmd && mmd->totlvl && mti->type == eModifierTypeType_OnlyDeform) {
if (!multiresModifier_reshapeFromDeformMod(depsgraph, scene, mmd, ob, md)) {
if (!multiresModifier_reshapeFromDeformModifier(depsgraph, scene, mmd, ob, md)) {
BKE_report(reports, RPT_ERROR, "Multires modifier returned error, skipping apply");
return 0;
}