[Bf-blender-cvs] [d74d7ef] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: d74d7ef566af9f06e6db522d7c59bb15abf6974d
Author: Antony Riakiotakis
Date:   Tue Mar 25 01:53:35 2014 +0200
https://developer.blender.org/rBd74d7ef566af9f06e6db522d7c59bb15abf6974d

Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c

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



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

diff --cc source/blender/editors/sculpt_paint/paint_image.c
index d9b4960,434aaaf..176e8c3
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@@ -1294,8 -975,10 +1294,9 @@@ static int sample_color_invoke(bContex
  	WM_redraw_windows(C);
  
  	RNA_int_set_array(op->ptr, "location", event->mval);
 -	paint_sample_color(C, ar, event->mval[0], event->mval[1]);
 +	paint_sample_color(C, ar, event->mval[0], event->mval[1], mode == PAINT_TEXTURE_PROJECTIVE, false);
+ 	WM_cursor_modal_set(CTX_wm_window(C), BC_EYEDROPPER_CURSOR);
  
 -	WM_event_add_modal_handler(C, op);
  	WM_event_add_notifier(C, NC_BRUSH | NA_EDITED, brush);
  
  	return OPERATOR_RUNNING_MODAL;
@@@ -1315,13 -995,8 +1316,14 @@@ static int sample_color_modal(bContext 
  			paint->flags |= PAINT_SHOW_BRUSH;
  		}
  
 +		if (data->sample_palette) {
 +			copy_v3_v3(brush->rgb, data->initcolor);
 +			RNA_boolean_set(op->ptr, "palette", true);
 +		}
+ 		WM_cursor_modal_restore(CTX_wm_window(C));
  		MEM_freeN(data);
 +		ED_area_headerprint(sa, NULL);
 +
  		return OPERATOR_FINISHED;
  	}
  
diff --cc source/blender/editors/space_view3d/drawmesh.c
index 719bd52,75a02b7..4495a19
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@@ -230,8 -233,9 +233,8 @@@ static bool set_draw_settings_cached(in
  	static int c_lit;
  	static int c_has_texface;
  
 -	Object *litob = NULL;  /* to get mode to turn off mipmap in painting mode */
  	int backculled = 1;
- 	int alphablend = 0;
+ 	int alphablend = GPU_BLEND_SOLID;
  	int textured = 0;
  	int lit = 0;
  	int has_texface = texface != NULL;
@@@ -255,12 -256,15 +258,15 @@@
  	if (gtexdraw.is_lit) lit = 1;
  
  	if (ma) {
- 		alphablend = ma->game.alpha_blend;
  		if (ma->mode & MA_SHLESS) lit = 0;
- 		backculled = (ma->game.flag & GEMAT_BACKCULL) || gtexdraw.use_backface_culling;
+ 		backculled = gtexdraw.use_backface_culling;
+ 		if (gtexdraw.use_game_mat) {
+ 			backculled = backculled || (ma->game.flag & GEMAT_BACKCULL);
+ 			alphablend = ma->game.alpha_blend;
+ 		}
  	}
  
 -	if (texface) {
 +	if (texface && !texpaint) {
  		textured = textured && (texface->tpage);
  
  		/* no material, render alpha if texture has depth=32 */