Blender Git Loki

Fix T91458: Displaying dope-sheet with sequencer keyframes crashes

Error in e6194e735791b42feb51e810a4910a41d999d3bf.

Merge branch 'eevee-rewrite' into viewport-compositor

EEVEE: Fix shader compilation caused by latest merge

Merge branch 'draw-viewport-data' into eevee-rewrite

DRW: Fix implicit convertion warning on MSVC

Merge branch 'eevee-rewrite' into viewport-compositor

# Conflicts:
# source/blender/blenkernel/BKE_scene.h
# source/blender/blenkernel/intern/scene.c
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/intern/draw_manager.h
# source/blender/nodes/composite/nodes/node_composite_composite.cc

Merge branch 'draw-viewport-data' into eevee-rewrite

Merge branch 'master' into draw-viewport-data

Merge branch 'draw-viewport-data' into eevee-rewrite

# Conflicts:
# source/blender/draw/engines/eevee/eevee_cryptomatte.c
# source/blender/draw/engines/eevee/eevee_effects.c
# source/blender/draw/engines/eevee/eevee_engine.c
# source/blender/draw/engines/eevee/eevee_lookdev.c
# source/blender/draw/engines/eevee/eevee_materials.c
# source/blender/draw/engines/eevee/eevee_motion_blur.c
# source/blender/draw/engines/eevee/eevee_private.h
# source/blender/draw/engines/eevee/eevee_render.c
# source/blender/draw/engines/eevee/eevee_subsurface.c
# source/blender/draw/engines/eevee/eevee_volumes.c
# source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
# source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
# source/blender/draw/intern/DRW_render.h
# source/blender/draw/intern/draw_cache.h
# source/blender/gpu/GPU_material.h
# source/blender/gpu/intern/gpu_codegen.c
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/shaders/gpu_shader_codegen_lib.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_hair_info.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
# source/blender/makesdna/DNA_gpencil_types.h
# source/blender/makesdna/DNA_node_types.h
# source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
# source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c

Fix Cycles use of uninitialized value in volume stack intersection on CPU

Could cause an actual bug but probability is low in practice.

Fix Cycles crash in certain hair configurations

The issue was caused by hair shader setup setting normal to a non
finite value, which then gets used to create a ray with non-finite
direction, making BVH traversal to run out of stack memory.

Happens with 150_0040_A.lighting.blend frame 112 of the Sprites
project.

Differential Revision: https://developer.blender.org/D12692

Merge branch 'master' into tracking_tools

Masking: Add masking tools to image editor

Clip and Image editor are using the same masking tools when in MASKEDIT
mode. To make that work in the keymap I have set the space_type to
'EMPTY', similar to the annotation tools. This seems to work well,
though I am not sure it is the right approach.

Merge branch 'master' into soc-2021-curves

Blender 2.83.19-rc

Cycles: Ensure finite displacement and background evaluation

Avoids possible numerical issues in the path tracing kernel, which
is most important for displacement as non-finite values in BVH can
lead to infinite node recursion during traversal.

Differential Revision: https://developer.blender.org/D12690

fix a char* that should have been a const char *.

fix linux compile error

One more clay fix

Merge branch 'master' into tracking_tools