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

[Sergey Sharybin]

Commit: 8e4b3e916e26f6b90ab0514a810cf8a898bff0b1
Author: Sergey Sharybin
Date:   Wed Oct 25 14:20:33 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB8e4b3e916e26f6b90ab0514a810cf8a898bff0b1

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_clip/clip_ops.c
index 970eae0ad14,7d8dd629562..4afec844f6d
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@@ -82,6 -83,6 +82,8 @@@
  
  #include "PIL_time.h"
  
++#include "DEG_depsgraph_build.h"
++
  #include "clip_intern.h"	// own include
  
  /******************** view navigation utilities *********************/
@@@ -247,6 -248,7 +249,7 @@@ static int open_exec(bContext *C, wmOpe
  
  	WM_event_add_notifier(C, NC_MOVIECLIP | NA_ADDED, clip);
  
 -	DAG_relations_tag_update(bmain);
++	DEG_relations_tag_update(bmain);
  	MEM_freeN(op->customdata);
  
  	return OPERATOR_FINISHED;
diff --cc source/blender/makesrna/intern/rna_main_api.c
index 3f1e9ae7f7d,7e2ced81a6d..52b953549ba
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@@ -84,9 -84,6 +84,10 @@@
  #include "BKE_mask.h"
  #include "BKE_gpencil.h"
  #include "BKE_linestyle.h"
 +#include "BKE_workspace.h"
 +
++#include "DEG_depsgraph_build.h"
 +#include "DEG_depsgraph_query.h"
  
  #include "DNA_armature_types.h"
  #include "DNA_camera_types.h"
@@@ -556,9 -543,13 +557,13 @@@ static MovieClip *rna_Main_movieclip_lo
  		clip = BKE_movieclip_file_add(bmain, filepath);
  	}
  
- 	if (!clip)
+ 	if (clip != NULL) {
 -		DAG_relations_tag_update(bmain);
++		DEG_relations_tag_update(bmain);
+ 	}
+ 	else {
  		BKE_reportf(reports, RPT_ERROR, "Cannot read '%s': %s", filepath,
  		            errno ? strerror(errno) : TIP_("unable to load movie clip"));
+ 	}
  
  	id_us_min((ID *)clip);
  	return clip;