Merge branch 'blender-v3.0-release'

2 files changed, 10 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/anim_path.c b/source/blender/blenkernel/intern/anim_path.c
index de470a15041..ff94a04e75e 100644
--- a/source/blender/blenkernel/intern/anim_path.c
+++ b/source/blender/blenkernel/intern/anim_path.c
@@ -254,6 +254,10 @@ bool BKE_where_on_path(const Object *ob,
     CLOG_WARN(&LOG, "No curve cache!");
     return false;
   }
+  if (ob->runtime.curve_cache->anim_path_accum_length == NULL) {
+    CLOG_WARN(&LOG, "No anim path!");
+    return false;
+  }
   /* We only use the first curve. */
   BevList *bl = ob->runtime.curve_cache->bev.first;
   if (bl == NULL || !bl->nr) {
diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c
index ccd9a4c061b..c9dbb94eb87 100644
--- a/source/blender/gpu/intern/gpu_viewport.c
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -590,11 +590,12 @@ GPUTexture *GPU_viewport_depth_texture(GPUViewport *viewport)
 /* Overlay framebuffer for drawing outside of DRW module. */
 GPUFrameBuffer *GPU_viewport_framebuffer_overlay_get(GPUViewport *viewport)
 {
-  GPU_framebuffer_ensure_config(&viewport->overlay_fb,
-                                {
-                                    GPU_ATTACHMENT_TEXTURE(viewport->depth_tx),
-                                    GPU_ATTACHMENT_TEXTURE(viewport->color_overlay_tx[0]),
-                                });
+  GPU_framebuffer_ensure_config(
+      &viewport->overlay_fb,
+      {
+          GPU_ATTACHMENT_TEXTURE(viewport->depth_tx),
+          GPU_ATTACHMENT_TEXTURE(viewport->color_overlay_tx[viewport->active_view]),
+      });
   return viewport->overlay_fb;
 }