Merge branch 'master' into blender2.8

2017-12-07 23:53:03 +11:00
parent 46f518e927 2e2e6e3bdb
commit 1c7cfa025c
46 changed files with 591 additions and 464 deletions
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -92,7 +92,6 @@ extern "C" {
 #include "BKE_particle.h"
 #include "BKE_rigidbody.h"
 #include "BKE_sound.h"
-#include "BKE_texture.h"
 #include "BKE_tracking.h"
 #include "BKE_world.h"