[Bf-blender-cvs] [f49c960ce65] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: f49c960ce658b3c4f5034cfb935a3d2783630162
Author: Antonio Vazquez
Date:   Thu Apr 27 11:45:19 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf49c960ce658b3c4f5034cfb935a3d2783630162

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index aad00e240d1,8502b34651c..7262554eb90
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -67,19 -64,18 +64,22 @@@ set(SR
  	intern/draw_cache_impl_lattice.c
  	intern/draw_cache_impl_mesh.c
  
- 	engines/clay/clay.c
- 	engines/clay/clay.h
+ 	engines/clay/clay_engine.c
+ 	engines/clay/clay_engine.h
  
- 	engines/eevee/eevee.c
+ 	engines/eevee/eevee_engine.c
+ 	engines/eevee/eevee_engine.h
  	engines/eevee/eevee_lights.c
  	engines/eevee/eevee_probes.c
- 	engines/eevee/eevee.h
  	engines/eevee/eevee_private.h
  
+ 	engines/basic/basic_engine.c
+ 	engines/basic/basic_engine.h
+ 
 +	engines/gpencil/gpencil_mode.h
 +	engines/gpencil/gpencil_mode.c
 +	engines/gpencil/gpencil_draw.c
 +
  	modes/object_mode.c
  	modes/edit_armature_mode.c
  	modes/edit_curve_mode.c
diff --cc source/blender/draw/intern/draw_manager.c
index 736cb8b19c4,6c85a2c83ee..6a2a52268ff
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -1683,11 -1842,29 +1842,31 @@@ static void DRW_engines_enable_from_mod
  			break;
  		case CTX_MODE_OBJECT:
  			break;
+ 		default:
+ 			BLI_assert(0);
+ 			break;
  	}
 +	/* grease pencil */
 +	use_drw_engine(&draw_engine_gpencil_type);
  }
  
+ /**
+  * Use for select and depth-drawing.
+  */
+ static void DRW_engines_enable_basic(void)
+ {
+ 	use_drw_engine(DRW_engine_viewport_basic_type.draw_engine);
+ }
+ 
+ static void DRW_engines_enable(const bContext *C)
+ {
+ 	Scene *scene = CTX_data_scene(C);
+ 	const int mode = CTX_data_mode_enum(C);
+ 	DRW_engines_enable_from_engine(scene);
+ 	DRW_engines_enable_from_object_mode();
+ 	DRW_engines_enable_from_mode(mode);
+ }
+ 
  static void DRW_engines_disable(void)
  {
  	BLI_freelistN(&DST.enabled_engines);
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 36e6ec4a01f,b86dcc33c73..810bdd21194
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -1396,12 -1396,8 +1397,13 @@@ static bool gp_session_initdata(bContex
  	
  	/* pass on current scene and window */
  	p->scene = CTX_data_scene(C);
+ 	p->graph = CTX_data_depsgraph(C);
  	p->win = CTX_wm_window(C);
 +	p->palette = BKE_palette_get_active_from_context(C);
 +	/* if not exist palette, create a new one */
 +	if (!p->palette) {
 +		p->palette = BKE_palette_add_gpencil(C);
 +	}
  	
  	unit_m4(p->imat);
  	unit_m4(p->mat);