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

[Bastien Montagne]

Commit: 1e4722eeabcc9c53616ab42b45e8a93206d46b73
Author: Bastien Montagne
Date:   Thu Jun 7 15:41:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1e4722eeabcc9c53616ab42b45e8a93206d46b73

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/transform/transform_generics.c

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



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

diff --cc source/blender/editors/transform/transform_generics.c
index fac0661004f,fec98c77c19..d3fcd5e5911
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@@ -359,9 -348,9 +359,10 @@@ static void recalcData_actedit(TransInf
  
  	/* initialize relevant anim-context 'context' data from TransInfo data */
  	/* NOTE: sync this with the code in ANIM_animdata_get_context() */
+ 	ac.bmain = CTX_data_main(t->context);
  	ac.scene = t->scene;
 -	ac.obact = OBACT;
 +	ac.view_layer = t->view_layer;
 +	ac.obact = OBACT(view_layer);
  	ac.sa = t->sa;
  	ac.ar = t->ar;
  	ac.sl = (t->sa) ? t->sa->spacedata.first : NULL;
@@@ -409,9 -398,9 +410,10 @@@ static void recalcData_graphedit(TransI
  
  	/* initialize relevant anim-context 'context' data from TransInfo data */
  	/* NOTE: sync this with the code in ANIM_animdata_get_context() */
+ 	ac.bmain = CTX_data_main(t->context);
 -	scene = ac.scene = t->scene;
 -	ac.obact = OBACT;
 +	ac.scene = t->scene;
 +	ac.view_layer = t->view_layer;
 +	ac.obact = OBACT(view_layer);
  	ac.sa = t->sa;
  	ac.ar = t->ar;
  	ac.sl = (t->sa) ? t->sa->spacedata.first : NULL;