Alaska
|
17cc72a685
|
Merge branch 'main'
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/intern/versioning_400.cc
source/blender/gpu/shaders/material/gpu_shader_material_glass.glsl
|
2024-01-10 17:45:49 +13:00 |
Alaska
|
f9309a78df
|
Fix incorrect merge with main
|
2023-11-07 18:35:00 +13:00 |
Alaska
|
5d992b8f68
|
Merge branch 'main'
Conflicts:
source/blender/blenloader/intern/versioning_400.cc
|
2023-11-07 17:52:56 +13:00 |
Alaska
|
b063073879
|
Add Specular Tint to Glass BSDF
buildbot/vexp-code-patch-coordinator Build done.
Details
|
2023-11-05 21:09:15 +13:00 |