Cycles: svn merge -r41225:41232 ^/trunk/blender
[blender.git] / source / blender / windowmanager / intern / wm_event_system.c
index e1670a6..799e618 100644 (file)
@@ -59,6 +59,7 @@
 
 #include "ED_fileselect.h"
 #include "ED_info.h"
+#include "ED_render.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
 #include "ED_util.h"
@@ -311,6 +312,7 @@ void wm_event_do_notifiers(bContext *C)
                /* XXX make lock in future, or separated derivedmesh users in scene */
                if(!G.rendering) {
                        /* depsgraph & animation: update tagged datablocks */
+                       Main *bmain = CTX_data_main(C);
 
                        /* copied to set's in scene_update_tagged_recursive() */
                        win->screen->scene->customdata_mask= win_combine_v3d_datamask;
@@ -318,7 +320,11 @@ void wm_event_do_notifiers(bContext *C)
                        /* XXX, hack so operators can enforce datamasks [#26482], gl render */
                        win->screen->scene->customdata_mask |= win->screen->scene->customdata_mask_modal;
 
-                       scene_update_tagged(CTX_data_main(C), win->screen->scene);
+                       scene_update_tagged(bmain, win->screen->scene);
+
+                       ED_render_engine_update_tagged(C, bmain);
+
+                       scene_clear_tagged(bmain, win->screen->scene);
                }
        }