diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2021-11-25 16:21:05 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2021-11-25 16:21:05 +0300 |
commit | 2378f057a050fff02cd87df305c06178c23ed83b (patch) | |
tree | 3add8c40ddc28555ff599207fb9d2bc8c7d8e3ab /source | |
parent | bc4c20d414e90c8e25e12cfee860e86adb06e961 (diff) | |
parent | ffddf9e5c9175d25078ca441b21e5eb478ecd106 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/anim_path.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_viewport.c | 11 |
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; } |