diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 17:02:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 17:02:46 +0300 |
| commit | 204c167c72fe20448200dc0a1504a84762ffd926 (patch) | |
| tree | 5f0adb8c5de4f8a0dd6406eabaa65fd36e3ff5ca /source/blender/compositor | |
| parent | 9e439197edcdae1ec9445524bd85bed85249f497 (diff) | |
| parent | 78a8d3685bd3487eb0b5dd55793f94fe7235e377 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_convert.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/windowmanager/intern/wm_draw.c
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_CompositorOperation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 241ae20ce33..16e33c908d6 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -22,6 +22,7 @@ #include "COM_CompositorOperation.h" #include "BLI_listbase.h" +#include "BKE_global.h" #include "BKE_image.h" extern "C" { @@ -109,7 +110,7 @@ void CompositorOperation::deinitExecution() } BLI_thread_lock(LOCK_DRAW_IMAGE); - BKE_image_signal(BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"), NULL, IMA_SIGNAL_FREE); + BKE_image_signal(G.main, BKE_image_verify_viewer(G.main, IMA_TYPE_R_RESULT, "Render Result"), NULL, IMA_SIGNAL_FREE); BLI_thread_unlock(LOCK_DRAW_IMAGE); } else { |