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

[Campbell Barton]

Commit: a9f92366709782a1bfdabdd0ec26383be60a6341
Author: Campbell Barton
Date:   Wed Jun 6 09:39:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa9f92366709782a1bfdabdd0ec26383be60a6341

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/blender_undo.c
index 371d9dff8d5,df2caba0208..857fc72672c
--- a/source/blender/blenkernel/intern/blender_undo.c
+++ b/source/blender/blenkernel/intern/blender_undo.c
@@@ -89,7 -89,7 +90,7 @@@ bool BKE_memfile_undo_decode(MemFileUnd
  
  	if (success) {
  		/* important not to update time here, else non keyed tranforms are lost */
- 		DEG_on_visible_update(G.main, false);
 -		DAG_on_visible_update(bmain, false);
++		DEG_on_visible_update(bmain, false);
  	}
  
  	return success;