[Bf-blender-cvs] [dc848e9a8b6] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: dc848e9a8b6486ea83461c67c068a9ae8ac154ae
Author: Dalai Felinto
Date:   Thu Dec 7 15:00:03 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBdc848e9a8b6486ea83461c67c068a9ae8ac154ae

Merge remote-tracking branch 'origin/master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/collada/DocumentImporter.cpp
index ec9a4169b26,f7fdfb06a40..d3e23f740c8
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@@ -57,12 -57,12 +57,13 @@@ extern "C" 
  #include "BLI_fileops.h"
  
  #include "BKE_camera.h"
 +#include "BKE_collection.h"
  #include "BKE_main.h"
 +#include "BKE_layer.h"
  #include "BKE_lamp.h"
  #include "BKE_library.h"
+ #include "BKE_texture.h"
  #include "BKE_fcurve.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_scene.h"
  #include "BKE_global.h"
  #include "BKE_material.h"