Blender Git Loki

Git Commits -> Revision 225c1b0

September 29, 2021, 15:24 (GMT)
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

Commit Details:

Full Hash: 225c1b070817f7b7d131bf7e239090e87abd4fed
Parent Commits: 2994b6d, f8cfd7e

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021