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

[Antonio Vazquez]

Commit: 67c2eab6a1c674f06306423107759960b59f518d
Author: Antonio Vazquez
Date:   Fri Jul 21 16:10:48 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB67c2eab6a1c674f06306423107759960b59f518d

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/BKE_context.h
index 1f66f34305b,2552e6fe1f6..8d74d87db52
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@@ -304,14 -307,10 +305,16 @@@ int CTX_data_visible_gpencil_layers(con
  int CTX_data_editable_gpencil_layers(const bContext *C, ListBase *list);
  int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list);
  
 +struct Palette *CTX_data_active_palette(const bContext *C);
 +struct PaletteColor *CTX_data_active_palettecolor(const bContext *C);
 +int CTX_data_active_palettecolors(const bContext *C, ListBase *list);
 +int CTX_data_available_palettes(const bContext *C, ListBase *list);
 +int CTX_data_available_palettecolors(const bContext *C, ListBase *list);
 +
  struct Depsgraph *CTX_data_depsgraph(const bContext *C);
  
+ void CTX_data_eval_ctx(const bContext *C, struct EvaluationContext *eval_ctx);
+ 
  #ifdef __cplusplus
  }
  #endif
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 0d8fadf8bac,834a1ced69d..9058721e10b
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -1922,9 -1941,9 +1922,9 @@@ static void gpencil_draw_exit(bContext 
  		U.gp_eraser = p->radius;
  		
  		/* cleanup */
- 		gp_paint_cleanup(p);
+ 		gp_paint_cleanup(C, p);
  		gp_session_cleanup(p);
 -		
 +
  		/* finally, free the temp data */
  		MEM_freeN(p);
  	}
diff --cc source/blender/editors/interface/interface_utils.c
index 1a099b32b30,f0317087ddc..74a46cb4532
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@@ -343,11 -343,11 +343,11 @@@ int UI_icon_from_report_type(int type
  /********************************** Misc **************************************/
  
  /**
 - * Returns the best "UI" precision for given floating value, so that e.g. 10.000001 rather gets drawn as '10'...
 - */
 +* Returns the best "UI" precision for given floating value, so that e.g. 10.000001 rather gets drawn as '10'...
 +*/
  int UI_calc_float_precision(int prec, double value)
  {
- 	static const double pow10_neg[UI_PRECISION_FLOAT_MAX + 1] = { 1e0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7 };
+ 	static const double pow10_neg[UI_PRECISION_FLOAT_MAX + 1] = {1e0, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6};
  	static const double max_pow = 10000000.0;  /* pow(10, UI_PRECISION_FLOAT_MAX) */
  
  	BLI_assert(prec <= UI_PRECISION_FLOAT_MAX);
diff --cc source/blender/editors/space_view3d/view3d_draw_legacy.c
index e38d5bb3c93,26c0440609e..3ea4ba5a766
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@@ -1634,20 -1579,11 +1639,20 @@@ static void view3d_draw_objects
  			if ((base->flag & BASE_VISIBLED) != 0) {
  				/* dupli drawing */
  				if (base->object->transflag & OB_DUPLI)
- 					draw_dupli_objects(scene, sl, ar, v3d, base);
+ 					draw_dupli_objects(C, scene, sl, ar, v3d, base);
  
- 				draw_object(scene, sl, ar, v3d, base, 0);
+ 				draw_object(C, scene, sl, ar, v3d, base, 0);
 +				/* draw grease pencil */
 +				if (base->object->type == OB_GPENCIL) {
 +					/* allocate memory for saving gp objects */
 +					gp_cache = ED_gpencil_allocate_cache(gp_cache, &gp_cache_size, gp_cache_used);
 +					/* add for drawing later */
 +					ED_gpencil_add_to_cache(gp_cache, rv3d, base, &gp_cache_used);
 +				}
  			}
  		}
 +		/* draw pending gpencil strokes */
 +		gpencil_draw_objects(C, scene, v3d, ar, gp_cache, gp_cache_used);
  	}
  	else {
  		unsigned int lay_used = 0;
@@@ -1660,20 -1596,11 +1665,20 @@@
  
  				/* dupli drawing */
  				if (base->object->transflag & OB_DUPLI) {
- 					draw_dupli_objects(scene, sl, ar, v3d, base);
+ 					draw_dupli_objects(C, scene, sl, ar, v3d, base);
  				}
  				if ((base->flag & BASE_SELECTED) == 0) {
 -					if (base->object != scene->obedit)
 +					if (base->object != scene->obedit) {
- 						draw_object(scene, sl, ar, v3d, base, 0);
+ 						draw_object(C, scene, sl, ar, v3d, base, 0);
 +
 +						/* draw grease pencil */
 +						if (base->object->type == OB_GPENCIL) {
 +							/* allocate memory for saving gp objects */
 +							gp_cache = ED_gpencil_allocate_cache(gp_cache, &gp_cache_size, gp_cache_used);
 +							/* add for drawing later */
 +							ED_gpencil_add_to_cache(gp_cache, rv3d, base, &gp_cache_used);
 +						}
 +					}
  				}
  			}
  		}
@@@ -1685,14 -1612,7 +1690,14 @@@
  		for (base = sl->object_bases.first; base; base = base->next) {
  			if ((base->flag & BASE_VISIBLED) != 0) {
  				if (base->object == scene->obedit || (base->flag & BASE_SELECTED)) {
- 					draw_object(scene, sl, ar, v3d, base, 0);
+ 					draw_object(C, scene, sl, ar, v3d, base, 0);
 +					/* draw grease pencil */
 +					if (base->object->type == OB_GPENCIL) {
 +						/* allocate memory for saving gp objects */
 +						gp_cache = ED_gpencil_allocate_cache(gp_cache, &gp_cache_size, gp_cache_used);
 +						/* add for drawing later */
 +						ED_gpencil_add_to_cache(gp_cache, rv3d, base, &gp_cache_used);
 +					}
  				}
  			}
  		}