[Bf-blender-cvs] [c9d4a0930b4] blender2.8: Merge branch 'master' into 28
Campbell Barton
noreply at git.blender.org
Wed Apr 26 16:55:08 CEST 2017
Commit: c9d4a0930b4206d736401ca6308ebfcb248d1c33
Author: Campbell Barton
Date: Thu Apr 27 00:58:28 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBc9d4a0930b4206d736401ca6308ebfcb248d1c33
Merge branch 'master' into 28
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/object.c
index fea292c1350,fbca03c1e07..b70eb2b503a
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -131,8 -127,9 +131,9 @@@
#endif
#include "CCGSubSurf.h"
+ #include "atomic_ops.h"
-#include "GPU_material.h"
+#include "GPU_lamp.h"
/* Vertex parent modifies original BMesh which is not safe for threading.
* Ideally such a modification should be handled as a separate DAG update
More information about the Bf-blender-cvs
mailing list