diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-07 13:13:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-07 13:29:50 +0300 |
| commit | ab0bc65c24bdf68c356adb2566f3669153c931ea (patch) | |
| tree | 23909478874a13d84e504a905809eb211e62a9e2 /source/blender/windowmanager | |
| parent | cee53160d2bd9067a3d43cc862ce61e36ff70454 (diff) | |
Refactor CDData masks, to have one mask per mesh elem type.
We already have different storages for cddata of verts, edges etc.,
'simply' do the same for the mask flags we use all around Blender code
to request some data, or limit some operation to some layers, etc.
Reason we need this is that some cddata types (like Normals) are
actually shared between verts/polys/loops, and we don’t want to generate
clnors everytime we request vnors!
As a side note, this also does final fix to T59338, which was the
trigger for this patch (need to request computed loop normals for
another mesh than evaluated one).
Reviewers: brecht, campbellbarton, sergey
Differential Revision: https://developer.blender.org/D4407
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ca0c931915f..08d7ec19eb3 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -47,6 +47,7 @@ #include "BLI_timer.h" #include "BKE_context.h" +#include "BKE_customdata.h" #include "BKE_idprop.h" #include "BKE_global.h" #include "BKE_layer.h" @@ -314,12 +315,12 @@ void wm_event_do_depsgraph(bContext *C) return; } /* Combine datamasks so 1 win doesn't disable UV's in another [#26448]. */ - uint64_t win_combine_v3d_datamask = 0; + CustomData_MeshMasks win_combine_v3d_datamask = {0}; for (wmWindow *win = wm->windows.first; win; win = win->next) { const Scene *scene = WM_window_get_active_scene(win); const bScreen *screen = WM_window_get_active_screen(win); - win_combine_v3d_datamask |= ED_view3d_screen_datamask(C, scene, screen); + ED_view3d_screen_datamask(C, scene, screen, &win_combine_v3d_datamask); } /* Update all the dependency graphs of visible view layers. */ for (wmWindow *win = wm->windows.first; win; win = win->next) { @@ -329,7 +330,7 @@ void wm_event_do_depsgraph(bContext *C) /* Copied to set's in scene_update_tagged_recursive() */ scene->customdata_mask = win_combine_v3d_datamask; /* XXX, hack so operators can enforce datamasks [#26482], gl render */ - scene->customdata_mask |= scene->customdata_mask_modal; + CustomData_MeshMasks_update(&scene->customdata_mask, &scene->customdata_mask_modal); /* TODO(sergey): For now all dependency graphs which are evaluated from * workspace are considered active. This will work all fine with "locked" * view layer and time across windows. This is to be granted separately, |