diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-26 21:14:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-26 21:14:23 +0400 |
| commit | 7f1a76887f975e4385684241d5be4cffa297afb0 (patch) | |
| tree | 3bf82cd7afdc81e7b10968f3f40ad07bc8a29d8f /source/blender/modifiers/intern/MOD_boolean.c | |
| parent | 6b3b7465b650a09292bf889ae78d178c6c8647b9 (diff) | |
workaround for depsgraph update issue with booleans.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 11 |
1 files changed, 10 insertions, 1 deletions
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; |