Commit: b8f990b0b4ee9acf1178e18b183affd13d2500d3
Author: Jeroen Bakker
Date: Fri Aug 28 15:43:14 2020 +0200
Branches: master
https://developer.blender.org/rBb8f990b0b4ee9acf1178e18b183affd13d2500d3
Revert "GPU: Fix Segmentation Fault Freeing Failed Shader"
This reverts commit c28432680971f54ebe95cc953606a3a4d3bc5c7c.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M source/blender/gpu/intern/gpu_shader_private.hh
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 2a85baf7318..260b439d0fb 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 2a85baf7318e2d8a26a25e6eb8211a2395d44a76
+Subproject commit 260b439d0fb15e3cd1efe5c120cf24f91d13d855
diff --git a/release/scripts/addons b/release/scripts/addons
index 7bd666f5f3a..01cf2f810ad 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 7bd666f5f3a0cb588fa99bf0786dc5ff834b2ea4
+Subproject commit 01cf2f810ad084cb4e2dad6dc7f82f3bc05f2a06
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. */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
