Merge branch 'blender-v2.81-release'

1 files changed, 4 insertions, 0 deletions

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 5e004c7d675..4c7e5e18257 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -89,6 +89,7 @@
 #include "ED_view3d.h"
 
 #include "GPU_extensions.h"
+#include "GPU_init_exit.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -6137,6 +6138,9 @@ static bool texture_paint_image_from_view_poll(bContext *C)
     CTX_wm_operator_poll_msg_set(C, "No 3D viewport found to create image from");
     return false;
   }
+  if (!GPU_is_initialized()) {
+    return false;
+  }
   return true;
 }