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:
authorNicholas Bishop <nicholasbishop@gmail.com>2012-05-11 00:32:09 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2012-05-11 00:32:09 +0400
commit3794ad5e14b61edf99b5edb99ff47cb7a258de88 (patch)
tree8e53e772cd544d0b98a5df0413652b263895fa76 /source/blender/modifiers/intern/MOD_multires.c
parent6dbfbabcd62164391a838a7ac4cf23a57f96e306 (diff)
Code cleanup for multires_dm_create_from_derived().
Changed name to multires_make_derived_from_derived() and parameter order to be more similar to subsurf_make_derived_from_derived(). Added MultiresFlags enum with flag values to replace the local_mmd and useRenderParams parameters.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_multires.c')
-rw-r--r--source/blender/modifiers/intern/MOD_multires.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index 6b181bd2c6d..ee2c7c82c42 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -77,6 +77,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm,
DerivedMesh *result;
Mesh *me = (Mesh *)ob->data;
const int useRenderParams = flag & MOD_APPLY_RENDER;
+ MultiresFlags flags = 0;
if (mmd->totlvl) {
if (!CustomData_get_layer(&me->ldata, CD_MDISPS)) {
@@ -85,7 +86,10 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm,
}
}
- result = multires_dm_create_from_derived(mmd, 0, dm, ob, useRenderParams);
+ if (useRenderParams)
+ flags |= MULTIRES_USE_RENDER_PARAMS;
+
+ result = multires_make_derived_from_derived(dm, mmd, ob, flags);
if (result == dm)
return dm;