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

Antonio Vazquez noreply at git.blender.org
Mon May 1 16:42:58 CEST 2017


Commit: ded0f9604e6e49f1d169a1bacf82d8adf5e59565
Author: Antonio Vazquez
Date:   Mon May 1 16:20:05 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBded0f9604e6e49f1d169a1bacf82d8adf5e59565

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 36b8ebda014,20298e064f1..9a4c9dfdaa3
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -94,15 -77,24 +77,27 @@@ set(SR
  	modes/particle_mode.c
  	modes/pose_mode.c
  	modes/sculpt_mode.c
+ 	engines/basic/basic_engine.c
+ 	engines/clay/clay_engine.c
+ 	engines/eevee/eevee_engine.c
+ 	engines/eevee/eevee_lights.c
+ 	engines/eevee/eevee_probes.c
++	engines/gpencil/gpencil_engine.h
++	engines/gpencil/gpencil_engine.c
++	engines/gpencil/gpencil_draw.c
  
+ 	DRW_engine.h
  	intern/DRW_render.h
- 	intern/draw_common.h
  	intern/draw_cache.h
  	intern/draw_cache_impl.h
+ 	intern/draw_common.h
+ 	intern/draw_manager_text.h
  	intern/draw_view.h
  	modes/draw_mode_engines.h
- 
- 	DRW_engine.h
+ 	engines/basic/basic_engine.h
+ 	engines/clay/clay_engine.h
+ 	engines/eevee/eevee_engine.h
+ 	engines/eevee/eevee_private.h
  )
  
  if(WITH_CLAY_ENGINE)
diff --cc source/blender/draw/intern/draw_cache.c
index ddfce3f1aea,864a95101cf..121b9bde88d
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@@ -506,8 -451,20 +506,20 @@@ Batch *DRW_cache_gpencil_axes_get(void
  /* -------------------------------------------------------------------- */
  
  /** \name Common Object API
 - * \{ */
 +* \{ */
  
+ Batch *DRW_cache_object_wire_outline_get(Object *ob)
+ {
+ 	switch (ob->type) {
+ 		case OB_MESH:
+ 			return DRW_cache_mesh_wire_outline_get(ob);
+ 
+ 		/* TODO, should match 'DRW_cache_object_surface_get' */
+ 		default:
+ 			return NULL;
+ 	}
+ }
+ 
  Batch *DRW_cache_object_surface_get(Object *ob)
  {
  	switch (ob->type) {
diff --cc source/blender/draw/intern/draw_manager.c
index 6a2a52268ff,97cd1102406..f82d952646f
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -1843,11 -1887,9 +1887,11 @@@ static void DRW_engines_enable_from_mod
  		case CTX_MODE_OBJECT:
  			break;
  		default:
- 			BLI_assert(0);
+ 			BLI_assert(!"Draw mode invalid");
  			break;
  	}
 +	/* grease pencil */
 +	use_drw_engine(&draw_engine_gpencil_type);
  }
  
  /**
@@@ -2376,8 -2439,6 +2441,7 @@@ void DRW_engines_register(void
  	DRW_engine_register(&draw_engine_particle_type);
  	DRW_engine_register(&draw_engine_pose_type);
  	DRW_engine_register(&draw_engine_sculpt_type);
 +	DRW_engine_register(&draw_engine_gpencil_type);
- #endif
  
  	/* setup callbacks */
  	{
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 810bdd21194,b4092a73df8..e4f26762780
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -1033,14 -1003,15 +1033,14 @@@ static void gp_stroke_newfrombuffer(tGP
  			MEM_freeN(depth_arr);
  	}
  	/* Save palette color */
 -	bGPDpalette *palette = BKE_gpencil_palette_getactive(p->gpd);
 -	bGPDpalettecolor *palcolor = BKE_gpencil_palettecolor_getactive(palette);
 -	gps->palcolor = palcolor;
 -	BLI_strncpy(gps->colorname, palcolor->info, sizeof(gps->colorname));
 +	gps->palette = p->palette;
 +	gps->palcolor = p->palettecolor;
 +	BLI_strncpy(gps->colorname, p->palettecolor->info, sizeof(gps->colorname));
  
  	/* add stroke to frame, usually on tail of the listbase, but if on back is enabled the stroke is added on listbase head 
- 	* because the drawing order is inverse and the head stroke is the first to draw. This is very useful for artist
- 	* when drawing the background
- 	*/
+ 	 * because the drawing order is inverse and the head stroke is the first to draw. This is very useful for artist
+ 	 * when drawing the background
+ 	 */
  	if ((ts->gpencil_flags & GP_TOOL_FLAG_PAINT_ONBACK) && (p->paintmode != GP_PAINTMODE_DRAW_POLY)) {
  		BLI_addhead(&p->gpf->strokes, gps);
  	}




More information about the Bf-blender-cvs mailing list