Commit: 6c32148cd2ea90cde4d4e46beb5ad4969b044c49
Author: mattoverby
Date: Wed Aug 19 09:24:53 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rB6c32148cd2ea90cde4d4e46beb5ad4969b044c49
merging from master
===================================================================
M source/blender/gpu/intern/gpu_backend.hh
M source/tools
===================================================================
diff --git a/source/blender/gpu/intern/gpu_backend.hh
b/source/blender/gpu/intern/gpu_backend.hh
index ab6e9cd7351..6ab0e32a754 100644
--- a/source/blender/gpu/intern/gpu_backend.hh
+++ b/source/blender/gpu/intern/gpu_backend.hh
@@ -28,10 +28,7 @@
#include "gpu_batch_private.hh"
#include "gpu_context_private.hh"
#include "gpu_drawlist_private.hh"
-<<<<<<< HEAD
-=======
#include "gpu_shader_private.hh"
->>>>>>> master
namespace blender {
namespace gpu {
diff --git a/source/tools b/source/tools
index 44ae9d181c7..ea2a2fa54ec 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 44ae9d181c734c14ae22feb0d33ad39a626f8ce7
+Subproject commit ea2a2fa54ecde677aaf4babf54ef4811adc82ccf
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
