diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-08-28 16:43:14 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-08-28 16:43:14 +0300 |
| commit | b8f990b0b4ee9acf1178e18b183affd13d2500d3 (patch) | |
| tree | d6581927784d9138c09ab4747912566823641a69 | |
| parent | 0ed7aedc71378ac451c4ae411711e58d8a2dbce0 (diff) | |
Revert "GPU: Fix Segmentation Fault Freeing Failed Shader"
This reverts commit c28432680971f54ebe95cc953606a3a4d3bc5c7c.
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_private.hh | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 2a85baf7318e2d8a26a25e6eb8211a2395d44a7 +Subproject 260b439d0fb15e3cd1efe5c120cf24f91d13d85 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 7bd666f5f3a0cb588fa99bf0786dc5ff834b2ea +Subproject 01cf2f810ad084cb4e2dad6dc7f82f3bc05f2a0 diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh index d56a7b2500b..22de1a0f59e 100644 --- a/source/blender/gpu/intern/gpu_shader_private.hh +++ b/source/blender/gpu/intern/gpu_shader_private.hh @@ -36,7 +36,7 @@ namespace gpu { class Shader { public: /** Uniform & attribute locations for shader. */ - ShaderInterface *interface = nullptr; + ShaderInterface *interface; protected: /** For debugging purpose. */ |