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>2021-01-25 15:47:56 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-25 15:47:56 +0300
commit4bc7996e2efae611cbd277b8f3fde2102836e01b (patch)
treeafe35335b57648eaa9003901113bca94192dcd17 /source/blender/editors/space_node/drawnode.c
parent72a207de35e7755abe638d0cd226a1e30ad10d06 (diff)
parent7a005fb7d172ba73936ad263aabd2ed7e4392688 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
-rw-r--r--source/blender/editors/space_node/drawnode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 055e3803e25..afd19df9f14 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -25,6 +25,7 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_system.h"
+#include "BLI_threads.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
@@ -3780,7 +3781,9 @@ void draw_nodespace_back_pix(const bContext *C,
/* The draw manager is used to draw the backdrop image. */
GPUFrameBuffer *old_fb = GPU_framebuffer_active_get();
GPU_framebuffer_restore();
+ BLI_thread_lock(LOCK_DRAW_IMAGE);
DRW_draw_view(C);
+ BLI_thread_unlock(LOCK_DRAW_IMAGE);
GPU_framebuffer_bind_no_srgb(old_fb);
/* Draw manager changes the depth state. Set it back to NONE. Without this the node preview
* images aren't drawn correctly. */