Commit: 58c6fc17b106a347b2e373b7f042343a78b88fc2
Author: mattoverby
Date: Wed Aug 19 09:09:16 2020 -0500
Branches: soc-2020-soft-body
https://developer.blender.org/rB58c6fc17b106a347b2e373b7f042343a78b88fc2
merged from master
===================================================================
===================================================================
diff --cc source/blender/gpu/intern/gpu_backend.hh
index 25d165098a7,6ab0e32a754..ab6e9cd7351
--- a/source/blender/gpu/intern/gpu_backend.hh
+++ b/source/blender/gpu/intern/gpu_backend.hh
@@@ -28,6 -28,7 +28,10 @@@
#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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
