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/makesdna | |
| 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/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index e2f1966bd50..1b597f45884 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -773,7 +773,7 @@ typedef struct Scene { unsigned int lay; /* bitflags for layer visibility */ int layact; /* active layer */ - int pad1; + unsigned int customdata_mask; /* XXX. runtime flag for drawing, actually belongs in the window, only used by object_handle_update() */ short flag; /* various settings */ |