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

[Brecht Van Lommel]

Commit: 569273c23454bbd20fb060787bd733163dc444dc
Author: Brecht Van Lommel
Date:   Sun Feb 18 19:29:17 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB569273c23454bbd20fb060787bd733163dc444dc

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_object.c
index d3096bbb6bb,e6e70694885..e37446028be
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -215,9 -199,15 +215,15 @@@ const EnumPropertyItem rna_enum_object_
  
  static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
  {
 -	DAG_id_tag_update(ptr->id.data, OB_RECALC_OB);
 +	DEG_id_tag_update(ptr->id.data, OB_RECALC_OB);
  }
  
+ static void rna_Object_internal_update_draw(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+ {
 -	DAG_id_tag_update(ptr->id.data, OB_RECALC_OB);
++	DEG_id_tag_update(ptr->id.data, OB_RECALC_OB);
+ 	WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data);
+ }
+ 
  static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr)
  {
  	/* don't use compat so we get predictable rotation */