operator macro playback (run operator reports in the console)

[blender-staging.git] / source / blender / blenkernel / intern / multires.c

diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 5def910ddef28a7a4bd3da2f75c01c8af9f226da..22a471f65219c49481fcd792962b167925966e81 100644 (file)
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -101,7 +101,7 @@ void multiresModifier_join(Object *ob)
        /* First find the highest level of subdivision */
        base = FIRSTBASE;
        while(base) {
-               if(TESTBASELIB_BGMODE(base) && base->object->type==OB_MESH) {
+               if(TESTBASELIB_BGMODE(v3d, base) && base->object->type==OB_MESH) {
                        ModifierData *md;
                        for(md = base->object->modifiers.first; md; md = md->next) {
                                if(md->type == eModifierType_Multires) {
@@ -124,7 +124,7 @@ void multiresModifier_join(Object *ob)
        /* Subdivide all the displacements to the highest level */
        base = FIRSTBASE;
        while(base) {
-               if(TESTBASELIB_BGMODE(base) && base->object->type==OB_MESH) {
+               if(TESTBASELIB_BGMODE(v3d, base) && base->object->type==OB_MESH) {
                        ModifierData *md = NULL;
                        MultiresModifierData *mmd = NULL;