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

[Brecht Van Lommel]

Commit: 2440415bd32a11561a1b7a57f9740978b2f93bdf
Author: Brecht Van Lommel
Date:   Tue Nov 7 03:06:18 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2440415bd32a11561a1b7a57f9740978b2f93bdf

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_image.c
index 09ea2efcd85,cb5d731efc5..75d9c1fe7fb
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@@ -175,6 -174,11 +175,11 @@@ static void rna_ImageUser_update(Main *
  	ImageUser *iuser = ptr->data;
  
  	BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
+ 
+ 	if(ptr->id.data) {
+ 		/* Update material or texture for render preview. */
 -		DAG_id_tag_update(ptr->id.data, 0);
++		DEG_id_tag_update(ptr->id.data, 0);
+ 	}
  }