[Bf-blender-cvs] [a981206fd18] blender2.8: Merge branch 'master' into blender2.8

[Sybren A. Stüvel]

Commit: a981206fd183355bdcc8331b3a74ce3d382e1f67
Author: Sybren A. Stüvel
Date:   Sun Apr 8 14:07:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa981206fd183355bdcc8331b3a74ce3d382e1f67

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/io/io_collada.c
index a42aeee912b,42c19c6bc65..4d0d59ae42c
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@@ -490,9 -496,7 +490,8 @@@ static int wm_collada_import_exec(bCont
  	import_settings.min_chain_length = min_chain_length;
  	import_settings.keep_bind_info = keep_bind_info != 0;
  
- 	if (collada_import(C, &import_settings) )
- 	{
+ 	if (collada_import(C, &import_settings)) {
 +		DEG_id_tag_update(&CTX_data_scene(C)->id, DEG_TAG_BASE_FLAGS_UPDATE);
  		return OPERATOR_FINISHED;
  	}
  	else {