Blender Git Loki
Git Commits -> Revision 421d41d
Revision 421d41d by Brecht Van Lommel (new-object-types) February 15, 2020, 21:25 (GMT) |
Smoke: put density/color in separate textrues, fixes for workbench shader This is more in line with standard grids and means we don't have to make as many special exceptions in the shading code. The workbench shader was also changed to fix bugs where squared density was used, and the smoke color would affect the density. |
Commit Details:
Full Hash: 421d41dc2ffd14d9ddcf9d4675212d6ca502f01a
Parent Commit: 26df09f
Lines Changed: +104, -76
12 Modified Paths:
/source/blender/blenloader/intern/readfile.c (+2, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_volumes.c (+13, -4) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl (+2, -1) (Diff)
/source/blender/draw/engines/workbench/workbench_volume.c (+4, -2) (Diff)
/source/blender/gpu/GPU_material.h (+6, -5) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+5, -1) (Diff)
/source/blender/gpu/intern/gpu_draw_smoke.c (+57, -50) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_volume_info.glsl (+10, -9) (Diff)
/source/blender/makesdna/DNA_fluid_types.h (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_attribute.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_volume_info.c (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_volume_principled.c (+1, -1) (Diff)
/source/blender/draw/engines/eevee/eevee_volumes.c (+13, -4) (Diff)
/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl (+2, -1) (Diff)
/source/blender/draw/engines/workbench/workbench_volume.c (+4, -2) (Diff)
/source/blender/gpu/GPU_material.h (+6, -5) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+5, -1) (Diff)
/source/blender/gpu/intern/gpu_draw_smoke.c (+57, -50) (Diff)
/source/blender/gpu/shaders/material/gpu_shader_material_volume_info.glsl (+10, -9) (Diff)
/source/blender/makesdna/DNA_fluid_types.h (+2, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_attribute.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_volume_info.c (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_volume_principled.c (+1, -1) (Diff)