Commit: b7d603b41cca270af54f91e09a43ac7b5f8ec159
Author: Clément Foucault
Date: Fri Apr 17 20:43:05 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBb7d603b41cca270af54f91e09a43ac7b5f8ec159
Fix T75832 DRW Hair: Crash caused by shader compilation
This also fix it the volume velocity needles.
===================================================================
M source/blender/draw/engines/overlay/overlay_shader.c
M source/blender/draw/intern/draw_hair.c
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_shader.c
b/source/blender/draw/engines/overlay/overlay_shader.c
index 607981cb0d0..f549a422f38 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -1341,6 +1341,7 @@ struct GPUShader *OVERLAY_shader_volume_velocity(bool
use_needle)
NULL,
datatoc_gpu_shader_flat_color_frag_glsl,
datatoc_common_view_lib_glsl,
+ "#define blender_srgb_to_framebuffer_space(a) a\n",
"#define USE_NEEDLE\n");
}
else if (!sh_data->volume_velocity_sh) {
@@ -1349,7 +1350,7 @@ struct GPUShader *OVERLAY_shader_volume_velocity(bool
use_needle)
NULL,
datatoc_gpu_shader_flat_color_frag_glsl,
datatoc_common_view_lib_glsl,
- NULL);
+ "#define blender_srgb_to_framebuffer_space(a) a\n");
}
return (use_needle) ? sh_data->volume_velocity_needle_sh :
sh_data->volume_velocity_sh;
}
diff --git a/source/blender/draw/intern/draw_hair.c
b/source/blender/draw/intern/draw_hair.c
index 0fe68950cde..ed7c72ac116 100644
--- a/source/blender/draw/intern/draw_hair.c
+++ b/source/blender/draw/intern/draw_hair.c
@@ -89,6 +89,7 @@ static GPUShader *hair_refine_shader_get(ParticleRefineShader
sh)
g_refine_shaders[sh] = DRW_shader_create(vert_with_lib,
NULL,
datatoc_gpu_shader_3D_smooth_color_frag_glsl,
+ "#define
blender_srgb_to_framebuffer_space(a) a\n"
"#define HAIR_PHASE_SUBDIV\n"
"#define TF_WORKAROUND\n");
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
