From 7f1a76887f975e4385684241d5be4cffa297afb0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 26 Jul 2012 17:14:23 +0000
Subject: [PATCH] workaround for depsgraph update issue with booleans.

---
 source/blender/modifiers/intern/MOD_boolean.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 6cd8745f5d9..ab293462228 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -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;