blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Philipp Oeser 2021-11-25 14:21:05 +01:00
parent bc4c20d414 ffddf9e5c9
commit 2378f057a0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/anim_path.c
View File

@ -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) {

11
source/blender/gpu/intern/gpu_viewport.c
View File

@ -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;
}