[Bf-blender-cvs] [65aab6cdae8] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Sat May 20 06:19:00 CEST 2017


Commit: 65aab6cdae822822122f5e180baf10e39f600bf2
Author: Campbell Barton
Date:   Sat May 20 14:19:05 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB65aab6cdae822822122f5e180baf10e39f600bf2

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_nla/nla_draw.c
index bb6a8676cc1,255fc0d6f8f..561c29b68cc
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@@ -386,12 -352,17 +386,12 @@@ static void nla_draw_strip(SpaceNla *sn
  				 */
  				if (strip->prev == NULL) {
  					/* set the drawing color to the color of the strip, but with very faint alpha */
 -					glColor4f(color[0], color[1], color[2], 0.15f);
 -					
 +					immUniformColor3fvAlpha(color, 0.15f);
 +
  					/* draw the rect to the edge of the screen */
 -					glBegin(GL_QUADS);
 -					glVertex2f(v2d->cur.xmin, yminc);
 -					glVertex2f(v2d->cur.xmin, ymaxc);
 -					glVertex2f(strip->start, ymaxc);
 -					glVertex2f(strip->start, yminc);
 -					glEnd();
 +					immRectf(shdr_pos, v2d->cur.xmin, yminc, strip->start, ymaxc);
  				}
- 				/* fall-through */
+ 				ATTR_FALLTHROUGH;
  
  			/* this only draws after the strip */
  			case NLASTRIP_EXTEND_HOLD_FORWARD: 
diff --cc source/blender/editors/transform/transform.c
index 02ad292e5c1,cebc024fab9..be5b475b89b
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@@ -1616,32 -1605,34 +1616,32 @@@ static void drawArrow(ArrowDirection d
  			offset = -offset;
  			length = -length;
  			size = -size;
- 			/* fall-through */
+ 			ATTR_FALLTHROUGH;
  		case RIGHT:
 -			glBegin(GL_LINES);
 -			glVertex2s(offset, 0);
 -			glVertex2s(offset + length, 0);
 -			glVertex2s(offset + length, 0);
 -			glVertex2s(offset + length - size, -size);
 -			glVertex2s(offset + length, 0);
 -			glVertex2s(offset + length - size,  size);
 -			glEnd();
 +			immVertex2f(POS_INDEX, offset, 0);
 +			immVertex2f(POS_INDEX, offset + length, 0);
 +			immVertex2f(POS_INDEX, offset + length, 0);
 +			immVertex2f(POS_INDEX, offset + length - size, -size);
 +			immVertex2f(POS_INDEX, offset + length, 0);
 +			immVertex2f(POS_INDEX, offset + length - size,  size);
  			break;
  
  		case DOWN:
  			offset = -offset;
  			length = -length;
  			size = -size;
- 			/* fall-through */
+ 			ATTR_FALLTHROUGH;
  		case UP:
 -			glBegin(GL_LINES);
 -			glVertex2s(0, offset);
 -			glVertex2s(0, offset + length);
 -			glVertex2s(0, offset + length);
 -			glVertex2s(-size, offset + length - size);
 -			glVertex2s(0, offset + length);
 -			glVertex2s(size, offset + length - size);
 -			glEnd();
 +			immVertex2f(POS_INDEX, 0, offset);
 +			immVertex2f(POS_INDEX, 0, offset + length);
 +			immVertex2f(POS_INDEX, 0, offset + length);
 +			immVertex2f(POS_INDEX, -size, offset + length - size);
 +			immVertex2f(POS_INDEX, 0, offset + length);
 +			immVertex2f(POS_INDEX, size, offset + length - size);
  			break;
  	}
 +
 +	immEnd();
  }
  
  static void drawArrowHead(ArrowDirection d, short size)
@@@ -1651,26 -1640,28 +1651,26 @@@
  	switch (d) {
  		case LEFT:
  			size = -size;
- 			/* fall-through */
+ 			ATTR_FALLTHROUGH;
  		case RIGHT:
 -			glBegin(GL_LINES);
 -			glVertex2s(0, 0);
 -			glVertex2s(-size, -size);
 -			glVertex2s(0, 0);
 -			glVertex2s(-size,  size);
 -			glEnd();
 +			immVertex2f(POS_INDEX, 0, 0);
 +			immVertex2f(POS_INDEX, -size, -size);
 +			immVertex2f(POS_INDEX, 0, 0);
 +			immVertex2f(POS_INDEX, -size,  size);
  			break;
  
  		case DOWN:
  			size = -size;
- 			/* fall-through */
+ 			ATTR_FALLTHROUGH;
  		case UP:
 -			glBegin(GL_LINES);
 -			glVertex2s(0, 0);
 -			glVertex2s(-size, -size);
 -			glVertex2s(0, 0);
 -			glVertex2s(size, -size);
 -			glEnd();
 +			immVertex2f(POS_INDEX, 0, 0);
 +			immVertex2f(POS_INDEX, -size, -size);
 +			immVertex2f(POS_INDEX, 0, 0);
 +			immVertex2f(POS_INDEX, size, -size);
  			break;
  	}
 +
 +	immEnd();
  }
  
  static void drawArc(float size, float angle_start, float angle_end, int segments)




More information about the Bf-blender-cvs mailing list