[Bf-blender-cvs] [2682d5cbe83] temp-workspace-object-mode-removal: Correct swapped flags

Campbell Barton noreply at git.blender.org
Wed Feb 7 03:36:51 CET 2018


Commit: 2682d5cbe8395b0162e2db6cb9eacfa5d7b6efb5
Author: Campbell Barton
Date:   Wed Feb 7 13:36:38 2018 +1100
Branches: temp-workspace-object-mode-removal
https://developer.blender.org/rB2682d5cbe8395b0162e2db6cb9eacfa5d7b6efb5

Correct swapped flags

===================================================================

M	source/blender/editors/object/object_bake.c

===================================================================

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 8afa5a46178..cf00e657fbf 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -227,7 +227,7 @@ static DerivedMesh *multiresbake_create_loresdm(
 
 	tmp_mmd.lvl = *lvl;
 	tmp_mmd.sculptlvl = *lvl;
-	dm = multires_make_derived_from_derived(cddm, &tmp_mmd, ob, object_mode, 0);
+	dm = multires_make_derived_from_derived(cddm, &tmp_mmd, ob, 0, object_mode);
 	cddm->release(cddm);
 
 	return dm;
@@ -256,7 +256,7 @@ static DerivedMesh *multiresbake_create_hiresdm(
 
 	tmp_mmd.lvl = mmd->totlvl;
 	tmp_mmd.sculptlvl = mmd->totlvl;
-	dm = multires_make_derived_from_derived(cddm, &tmp_mmd, ob, object_mode, 0);
+	dm = multires_make_derived_from_derived(cddm, &tmp_mmd, ob, 0, object_mode);
 	cddm->release(cddm);
 
 	return dm;



More information about the Bf-blender-cvs mailing list