[Bf-blender-cvs] [5941d4e33b] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 5941d4e33bcea501f5323b3dd6a8576edacb7b1f
Author: Julian Eisel
Date:   Thu Mar 2 19:26:29 2017 +0100
Branches: workspaces
https://developer.blender.org/rB5941d4e33bcea501f5323b3dd6a8576edacb7b1f

Merge branch 'blender2.8' into workspaces

Conflicts:
	source/blender/makesrna/intern/rna_space.c

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



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

diff --cc source/blender/makesrna/intern/rna_space.c
index 76342fa87a,cb57893e5b..24bd0ba0be
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -255,7 -255,7 +255,8 @@@ EnumPropertyItem rna_enum_file_sort_ite
  #include "BKE_colortools.h"
  #include "BKE_context.h"
  #include "BKE_depsgraph.h"
+ #include "BKE_layer.h"
 +#include "BKE_global.h"
  #include "BKE_nla.h"
  #include "BKE_paint.h"
  #include "BKE_scene.h"
@@@ -833,9 -818,11 +834,12 @@@ static int rna_SpaceImageEditor_show_ma
  {
  	SpaceImage *sima = (SpaceImage *)(ptr->data);
  	bScreen *sc = (bScreen *)ptr->id.data;
 +	Scene *scene = ED_screen_scene_find(sc, G.main->wm.first);
  
- 	return ED_space_image_check_show_maskedit(scene, sima);
+ 	TODO_LAYER_CONTEXT; /* get SceneLayer from context/window/workspace instead */
 -	SceneLayer *sl = BKE_scene_layer_context_active(sc->scene);
++	SceneLayer *sl = BKE_scene_layer_context_active(scene);
+ 
+ 	return ED_space_image_check_show_maskedit(sl, sima);
  }
  
  static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value)