[Bf-blender-cvs] [5a14dd7] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 5a14dd7476a2c499da61ae0525f97f29cb4c3305
Author: Antony Riakiotakis
Date:   Mon Feb 16 13:02:00 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB5a14dd7476a2c499da61ae0525f97f29cb4c3305

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/space_sequencer/sequencer_draw.c

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



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

diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index 1644efb,b63c46c..13a15e1
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1210,8 -1198,13 +1217,8 @@@ void draw_image_seq(const bContext *C, 
  	else
  		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ibuf->x, ibuf->y, 0, format, type, display_buffer);
  
- 	if (draw_overdrop) {
+ 	if (draw_backdrop) {
 -		glMatrixMode(GL_PROJECTION);
 -		glPushMatrix();
 -		glLoadIdentity();
 -		glMatrixMode(GL_MODELVIEW);
 -		glPushMatrix();
 -		glLoadIdentity();
 +		UI_view2d_view_restore(C);
  	}
  	glBegin(GL_QUADS);
  
@@@ -1235,16 -1228,24 +1242,16 @@@
  			glTexCoord2f(1.0f, 0.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymin);
  		}
  	}
- 	else if (draw_overdrop) {
+ 	else if (draw_backdrop) {
 -		float aspect = BLI_rcti_size_x(&ar->winrct) / (float)BLI_rcti_size_y(&ar->winrct);	
 -		float image_aspect = viewrect[0] / viewrect[1];
 -		float imagex, imagey;
 +		float imagex = (scene->r.size * scene->r.xsch) / 200.0f * sseq->overdrop_zoom;
 +		float imagey = (scene->r.size * scene->r.ysch) / 200.0f * sseq->overdrop_zoom;
 +		float xofs = BLI_rcti_size_x(&ar->winrct)/2.0f + sseq->overdrop_offset[0];
 +		float yofs = BLI_rcti_size_y(&ar->winrct)/2.0f + sseq->overdrop_offset[1];
  		
 -		if (aspect >= image_aspect) {
 -			imagex = image_aspect / aspect;
 -			imagey = 1.0f;
 -		}
 -		else {
 -			imagex = 1.0f;
 -			imagey = aspect / image_aspect;
 -		}
 -		
 -		glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex, -imagey);
 -		glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex, imagey);
 -		glTexCoord2f(1.0f, 1.0f); glVertex2f(imagex, imagey);
 -		glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex, -imagey);
 +		glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex + xofs, -imagey + yofs);
 +		glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex + xofs, imagey + yofs);
 +		glTexCoord2f(1.0f, 1.0f); glVertex2f(imagex + xofs, imagey + yofs);
 +		glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex + xofs, -imagey + yofs);
  	}
  	else {
  		glTexCoord2f(0.0f, 0.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymin);
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index c14812f,0f57a83..c8f7399
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -1977,17 -1966,11 +1979,19 @@@ static void view3d_draw_xraytransp(Scen
  	v3d->xray = true;
  	v3d->transp = true;
  	
+ 	glDepthMask(GL_FALSE);
+ 
  	for (v3da = v3d->afterdraw_xraytransp.first; v3da; v3da = next) {
  		next = v3da->next;
 +		if (v3da->base->flag & OB_FROMDUPLI) {
 +			copy_m4_m4(obmat, v3da->base->object->obmat);
 +			copy_m4_m4(v3da->base->object->obmat, v3da->obmat);
 +		}
  		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
 +		if (v3da->base->flag & OB_FROMDUPLI) {
 +			copy_m4_m4(v3da->base->object->obmat, obmat);
 +			MEM_freeN(v3da->base);
 +		}
  		BLI_remlink(&v3d->afterdraw_xraytransp, v3da);
  		MEM_freeN(v3da);
  	}
@@@ -2699,9 -2672,9 +2704,10 @@@ static void view3d_draw_objects
  	RegionView3D *rv3d = ar->regiondata;
  	Base *base;
  	const bool do_camera_frame = !draw_offscreen;
 +	const bool is_wire_color = V3D_IS_WIRECOLOR(scene, v3d);
  	const bool draw_floor = (rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO);
  	const bool draw_grids = !draw_offscreen && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0;
+ 	bool xrayclear = true;
  
  	if (!draw_offscreen) {
  		ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);