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/editors
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/editors')
-rw-r--r--source/blender/editors/object/object_bake.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 1aaf42ae785..91acb18dfda 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -1020,7 +1020,8 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l
tmp_mmd.lvl = *lvl;
tmp_mmd.sculptlvl = *lvl;
- dm = multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0);
+ dm = multires_make_derived_from_derived(cddm, &tmp_mmd, ob,
+ MULTIRES_USE_LOCAL_MMD);
cddm->release(cddm);
}
@@ -1040,7 +1041,8 @@ static DerivedMesh *multiresbake_create_hiresdm(Scene *scene, Object *ob, int *l
tmp_mmd.lvl = mmd->totlvl;
tmp_mmd.sculptlvl = mmd->totlvl;
- dm = multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0);
+ dm = multires_make_derived_from_derived(cddm, &tmp_mmd, ob,
+ MULTIRES_USE_LOCAL_MMD);
cddm->release(cddm);
return dm;