diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-05-11 00:31:55 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-05-11 00:31:55 +0400 |
commit | 6dbfbabcd62164391a838a7ac4cf23a57f96e306 (patch) | |
tree | 1f4f2166161aff81c64bdb149d7bcf72887665b4 /source/blender/modifiers/intern/MOD_subsurf.c | |
parent | 072a882d035936c7eeca6abeb8781a330ebd07d5 (diff) |
Code cleanup for parameters of subsurf_make_derived_from_derived.
This is the first commit of the sculpt masking merge. Documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/PaintMasks
Thanks to Brecht for reviewing!
Replaced four boolean parameters with a single flag and a new enum,
SubsurfFlags.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_subsurf.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 16824139d60..683dbc38ee5 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -94,12 +94,19 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, ModifierApplyFlag flag) { SubsurfModifierData *smd = (SubsurfModifierData *) md; + SubsurfFlags subsurf_flags = 0; DerivedMesh *result; const int useRenderParams = flag & MOD_APPLY_RENDER; const int isFinalCalc = flag & MOD_APPLY_USECACHE; - result = subsurf_make_derived_from_derived(derivedData, smd, useRenderParams, NULL, - isFinalCalc, 0, (ob->flag & OB_MODE_EDIT)); + if(useRenderParams) + subsurf_flags |= SUBSURF_USE_RENDER_PARAMS; + if(isFinalCalc) + subsurf_flags |= SUBSURF_IS_FINAL_CALC; + if(ob->flag & OB_MODE_EDIT) + subsurf_flags |= SUBSURF_IN_EDIT_MODE; + + result = subsurf_make_derived_from_derived(derivedData, smd, NULL, subsurf_flags); if (useRenderParams || !isFinalCalc) { DerivedMesh *cddm = CDDM_copy(result); @@ -117,8 +124,9 @@ static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), SubsurfModifierData *smd = (SubsurfModifierData *) md; DerivedMesh *result; - result = subsurf_make_derived_from_derived(derivedData, smd, 0, - NULL, 0, 1, 1); + result = subsurf_make_derived_from_derived(derivedData, smd, + NULL, (SUBSURF_FOR_EDIT_MODE | + SUBSURF_IN_EDIT_MODE)); return result; } |