[Bf-blender-cvs] [3ac2577e86e] greasepencil-object: Merge remote-tracking branch 'origin/blender2.8' into greasepencil-object

[Dalai Felinto]

Commit: 3ac2577e86e948fabed026aa05ba48c7e4d568f7
Author: Dalai Felinto
Date:   Thu Nov 23 15:05:23 2017 -0200
Branches: greasepencil-object
https://developer.blender.org/rB3ac2577e86e948fabed026aa05ba48c7e4d568f7

Merge remote-tracking branch 'origin/blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/animation/anim_filter.c
index 7f2d6220ba7,bc901d7e13f..8804896c3a1
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@@ -1708,9 -1695,9 +1708,9 @@@ static size_t animdata_filter_gpencil(b
  		}
  		
  		/* Objects in the scene */
- 		for (base = sl->object_bases.first; base; base = base->next) {
+ 		for (base = view_layer->object_bases.first; base; base = base->next) {
  			/* Only consider this object if it has got some GP data (saving on all the other tests) */
 -			if (base->object && base->object->gpd) {
 +			if (base->object && (base->object->type == OB_GPENCIL)) {
  				Object *ob = base->object;
  				
  				/* firstly, check if object can be included, by the following factors:
diff --cc source/blender/editors/object/object_modifier.c
index 82cbf44e1ba,ca58a60806c..25ed7cac862
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -923,9 -895,9 +923,9 @@@ static int modifier_remove_exec(bContex
  	/* if cloth/softbody was removed, particle mode could be cleared */
  	if (mode_orig & OB_MODE_PARTICLE_EDIT)
  		if ((ob->mode & OB_MODE_PARTICLE_EDIT) == 0)
- 			if (sl->basact && sl->basact->object == ob)
+ 			if (view_layer->basact && view_layer->basact->object == ob)
  				WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_OBJECT, NULL);
 -	
 +
  	return OPERATOR_FINISHED;
  }
  
diff --cc source/blender/editors/space_outliner/outliner_select.c
index acda6e6c5ce,5215efaa05c..33107bd05d1
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@@ -967,12 -940,8 +967,12 @@@ static void do_outliner_item_activate_t
  		else if (ELEM(te->idcode, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) {
  			WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
  		}
 +		else if (ELEM(te->idcode, ID_GD)) {
 +			/* set grease pencil to object mode */
 +			WM_operator_name_call(C, "GPENCIL_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
 +		}
  		else {  // rest of types
- 			tree_element_active(C, scene, sl, soops, te, OL_SETSEL_NORMAL, false);
+ 			tree_element_active(C, scene, view_layer, soops, te, OL_SETSEL_NORMAL, false);
  		}
  
  	}
diff --cc source/blender/editors/transform/transform_manipulator.c
index 523b1247a8a,9623e0988da..0786f00c8d0
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -596,9 -596,9 +596,9 @@@ static int calc_manipulator_stats
  	View3D *v3d = sa->spacedata.first;
  	RegionView3D *rv3d = ar->regiondata;
  	Base *base;
- 	Object *ob = OBACT(sl);
+ 	Object *ob = OBACT(view_layer);
  	bGPdata *gpd = CTX_data_gpencil_data(C);
 -	const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
 +	const bool is_gp_edit = GPENCIL_ANY_MODE(gpd);
  	int a, totsel = 0;
  
  	/* transform widget matrix */