Blender Git Commit Log

Git Commits -> Revision 62aa72d

July 19, 2021, 21:04 (GMT)
Merge branch 'draw-viewport-data' into eevee-rewrite

# Conflicts:
# source/blender/blenlib/BLI_assert.h
# source/blender/blenloader/intern/versioning_290.c
# source/blender/draw/engines/eevee/eevee_cryptomatte.c
# source/blender/draw/engines/eevee/eevee_depth_of_field.c
# source/blender/draw/engines/eevee/eevee_effects.c
# source/blender/draw/engines/eevee/eevee_engine.c
# source/blender/draw/engines/eevee/eevee_lightcache.c
# source/blender/draw/engines/eevee/eevee_lightprobes.c
# source/blender/draw/engines/eevee/eevee_lights.c
# source/blender/draw/engines/eevee/eevee_lookdev.c
# source/blender/draw/engines/eevee/eevee_materials.c
# source/blender/draw/engines/eevee/eevee_mist.c
# source/blender/draw/engines/eevee/eevee_motion_blur.c
# source/blender/draw/engines/eevee/eevee_occlusion.c
# source/blender/draw/engines/eevee/eevee_private.h
# source/blender/draw/engines/eevee/eevee_render.c
# source/blender/draw/engines/eevee/eevee_renderpasses.c
# source/blender/draw/engines/eevee/eevee_screen_raytrace.c
# source/blender/draw/engines/eevee/eevee_shaders.c
# source/blender/draw/engines/eevee/eevee_shadows.c
# source/blender/draw/engines/eevee/eevee_shadows_cascade.c
# source/blender/draw/engines/eevee/eevee_subsurface.c
# source/blender/draw/engines/eevee/eevee_temporal_sampling.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/bsdf_common_lib.glsl
# source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl
# source/blender/draw/engines/eevee/shaders/closure_eval_lib.glsl
# source/blender/draw/engines/eevee/shaders/closure_type_lib.glsl
# source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
# source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl
# source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_flatten_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_dilate_tiles_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_reduce_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_dof_setup_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_reflection_resolve_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_reflection_trace_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_subsurface_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl
# source/blender/draw/engines/eevee/shaders/effect_translucency_frag.glsl
# source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl
# source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl
# source/blender/draw/engines/eevee/shaders/lights_lib.glsl
# source/blender/draw/engines/eevee/shaders/random_lib.glsl
# source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl
# source/blender/draw/engines/eevee/shaders/ssr_lib.glsl
# source/blender/draw/engines/eevee/shaders/surface_lib.glsl
# source/blender/draw/engines/eevee/shaders/volumetric_geom.glsl
# source/blender/draw/engines/eevee/shaders/volumetric_lib.glsl
# source/blender/draw/intern/draw_manager_shader.c
# source/blender/draw/intern/shaders/common_math_lib.glsl
# source/blender/gpu/CMakeLists.txt
# source/blender/gpu/intern/gpu_codegen.c
# source/blender/gpu/intern/gpu_shader.cc
# source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_world_normals.glsl
# source/blender/nodes/shader/nodes/node_shader_output_aov.c

Commit Details:

Full Hash: 62aa72dac89acb97bf7f1002935f25672c1f0247
Parent Commits: 0053d2f, 6206a30

By: Miika HämäläinenLast update: Nov-07-2014 14:18 MiikaHweb | 2003-2021