Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-28 05:41:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-28 05:41:36 +0300
commitdcf0860dabf326e3a4b37ae15baae491e661cbf8 (patch)
treed922c5698ee58ae5153545798ebaaf4957803b98 /source/blender/windowmanager/intern/wm_draw.c
parent54295369049f9004cce6d8ccacaeda3a52e59a68 (diff)
Fix tool not being initialized switching windows
Diffstat (limited to 'source/blender/windowmanager/intern/wm_draw.c')
-rw-r--r--source/blender/windowmanager/intern/wm_draw.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index d760780beb8..654a3cf05b9 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -73,6 +73,7 @@
#include "WM_api.h"
#include "WM_types.h"
+#include "WM_toolsystem.h"
#include "wm.h"
#include "wm_draw.h"
#include "wm_window.h"
@@ -542,6 +543,11 @@ static void wm_draw_window_offscreen(bContext *C, wmWindow *win, bool stereo)
ED_area_update_region_sizes(wm, win, sa);
+ if (sa->flag & AREA_FLAG_ACTIVE_TOOL_UPDATE) {
+ WM_toolsystem_update_from_context(C, CTX_wm_workspace(C), CTX_data_view_layer(C), sa);
+ sa->flag &= ~AREA_FLAG_ACTIVE_TOOL_UPDATE;
+ }
+
/* Then do actual drawing of regions. */
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar->visible && ar->do_draw) {