diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-23 07:16:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-23 07:16:31 +0300 |
| commit | c046ae14be2e0142c3ea9c5d81b946594043c3f7 (patch) | |
| tree | 8c6d502768d872e245d42a45507075bc1ed5ab0a /source/blender/blenkernel/intern/scene.c | |
| parent | 86b89af5ddaede7bedf6a98f20e0b4f92e5796b2 (diff) | |
Fix for multiple modifier stack calculations per frame.
Since 2.5x blender has been using CD_MASK_BAREMESH for updating objects since object_handle_update() no longer has access to G.curscreen to calculate the mask from viewports.
The problem with this is after an initial calculation, CD_MASK_MTFACE may be required on draw, so it would recalculate the modifier stack multiple times per frame.
One case which caused this is armature animated mesh with texface in a dupligroup.
Fix this by having customdata_mask member in the scene, this isn't great design but at least fixes the bug and only changes a few files.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 7a8c4efb51a..9aeb9a89c90 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -946,6 +946,7 @@ float BKE_curframe(Scene *scene) static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scene_parent) { Base *base; + scene->customdata_mask= scene_parent->customdata_mask; /* sets first, we allow per definition current scene to have dependencies on sets, but not the other way around. */ |