workaround for depsgraph update issue with booleans.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 17:14:23 +0000 (17:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 17:14:23 +0000 (17:14 +0000)
source/blender/modifiers/intern/MOD_boolean.c

index 6cd8745f5d9b959abb7fe3afe6112f10407f067e..ab29346222898d6750e5b4d29040ca662a1001f0 100644 (file)
@@ -127,7 +127,16 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
        if (!bmd->object)
                return derivedData;
 
-       dm = bmd->object->derivedFinal;
+
+       /* 2.64 used this... */
+       /* dm = bmd->object->derivedFinal; */
+
+       /* but we want to make sure we can get the object
+        * in some cases the depsgraph fails us - especially for objects
+        * in other scenes when compositing */
+       if (bmd->object != ob) {
+               dm = mesh_get_derived_final(md->scene, bmd->object, CD_MASK_MESH);
+       }
 
        if (dm) {
                DerivedMesh *result;