[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49260] trunk/blender/source/blender/ modifiers/intern/MOD_boolean.c: workaround for depsgraph update issue with booleans.

[Campbell Barton]

Revision: 49260
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49260
Author:   campbellbarton
Date:     2012-07-26 17:14:23 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
workaround for depsgraph update issue with booleans.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_boolean.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c	2012-07-26 16:56:09 UTC (rev 49259)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c	2012-07-26 17:14:23 UTC (rev 49260)
@@ -127,8 +127,17 @@
 	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;