svn merge ^/trunk/blender -r42871:42882

1 files changed, 74 insertions, 9 deletions

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 9ce4779616e..4514b36f3a5 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -143,11 +143,16 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 	if (validSnap(t) && activeSnap(t))
 		{
 		
-		unsigned char col[4];
+		unsigned char col[4], selectedCol[4], activeCol[4];
 		UI_GetThemeColor3ubv(TH_TRANSFORM, col);
 		col[3]= 128;
-		glColor4ubv(col);
 		
+		UI_GetThemeColor3ubv(TH_SELECT, selectedCol);
+		selectedCol[3]= 128;
+
+		UI_GetThemeColor3ubv(TH_ACTIVE, activeCol);
+		activeCol[3]= 192;
+
 		if (t->spacetype == SPACE_VIEW3D) {
 			TransSnapPoint *p;
 			View3D *v3d = CTX_wm_view3d(C);
@@ -162,16 +167,26 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 			invert_m4_m4(imat, rv3d->viewmat);
 
 			for (p = t->tsnap.points.first; p; p = p->next) {
-				drawcircball(GL_LINE_LOOP, p->co, ED_view3d_pixel_size(rv3d, p->co) * size, imat);
+				if (p == t->tsnap.selectedPoint) {
+					glColor4ubv(selectedCol);
+				} else {
+					glColor4ubv(col);
+				}
+
+				drawcircball(GL_LINE_LOOP, p->co, ED_view3d_pixel_size(rv3d, p->co) * size * 0.75f, imat);
 			}
 
 			if (t->tsnap.status & POINT_INIT) {
+				glColor4ubv(activeCol);
+
 				drawcircball(GL_LINE_LOOP, t->tsnap.snapPoint, ED_view3d_pixel_size(rv3d, t->tsnap.snapPoint) * size, imat);
 			}
 			
 			/* draw normal if needed */
 			if (usingSnappingNormal(t) && validSnappingNormal(t))
 			{
+				glColor4ubv(activeCol);
+
 				glBegin(GL_LINES);
 					glVertex3f(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], t->tsnap.snapPoint[2]);
 					glVertex3f(	t->tsnap.snapPoint[0] + t->tsnap.snapNormal[0],
@@ -221,7 +236,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 	}
 }
 
-int  handleSnapping(TransInfo *UNUSED(t), wmEvent *UNUSED(event))
+int  handleSnapping(TransInfo *t, wmEvent *event)
 {
 	int status = 0;
 
@@ -234,6 +249,10 @@ int  handleSnapping(TransInfo *UNUSED(t), wmEvent *UNUSED(event))
 		status = 1;
 	}
 #endif
+	if (event->type == MOUSEMOVE)
+	{
+		status |= updateSelectedSnapPoint(t);
+	}
 	
 	return status;
 }
@@ -543,6 +562,8 @@ void addSnapPoint(TransInfo *t)
 	if (t->tsnap.status & POINT_INIT) {
 		TransSnapPoint *p = MEM_callocN(sizeof(TransSnapPoint), "SnapPoint");
 
+		t->tsnap.selectedPoint = p;
+
 		copy_v3_v3(p->co, t->tsnap.snapPoint);
 
 		BLI_addtail(&t->tsnap.points, p);
@@ -551,13 +572,55 @@ void addSnapPoint(TransInfo *t)
 	}
 }
 
+int updateSelectedSnapPoint(TransInfo *t)
+{
+	int status = 0;
+	if (t->tsnap.status & MULTI_POINTS) {
+		TransSnapPoint *p, *closest_p = NULL;
+		int closest_dist = 0;
+		int screen_loc[2];
+
+		for( p = t->tsnap.points.first; p; p = p->next ) {
+			int dx, dy;
+			int dist;
+
+			project_int(t->ar, p->co, screen_loc);
+
+			dx = t->mval[0] - screen_loc[0];
+			dy = t->mval[1] - screen_loc[1];
+
+			dist = dx * dx + dy * dy;
+
+			if (dist < 100 && (closest_p == NULL || closest_dist > dist)) {
+				closest_p = p;
+				closest_dist = dist;
+			}
+		}
+
+		if (closest_p) {
+			status = t->tsnap.selectedPoint == closest_p ? 0 : 1;
+			t->tsnap.selectedPoint = closest_p;
+		}
+	}
+
+	return status;
+}
+
 void removeSnapPoint(TransInfo *t)
 {
 	if (t->tsnap.status & MULTI_POINTS) {
-		BLI_freelinkN(&t->tsnap.points, t->tsnap.points.last);
+		updateSelectedSnapPoint(t);
+
+		if (t->tsnap.selectedPoint) {
+			BLI_freelinkN(&t->tsnap.points, t->tsnap.selectedPoint);
+
+			if (t->tsnap.points.first == NULL) {
+				t->tsnap.status &= ~MULTI_POINTS;
+			}
+
+			t->tsnap.selectedPoint = NULL;
+		}
 
-		if (t->tsnap.points.first == NULL)
-			t->tsnap.status &= ~MULTI_POINTS;
 	}
 }
 
@@ -682,7 +745,7 @@ static float RotationBetween(TransInfo *t, float p1[3], float p2[3])
 
 static float ResizeBetween(TransInfo *t, float p1[3], float p2[3])
 {
-	float d1[3], d2[3], center[3];
+	float d1[3], d2[3], center[3], len_d1;
 	
 	copy_v3_v3(center, t->center);	
 	if(t->flag & (T_EDIT|T_POSE)) {
@@ -698,7 +761,9 @@ static float ResizeBetween(TransInfo *t, float p1[3], float p2[3])
 		mul_m3_v3(t->con.pmtx, d2);
 	}
 	
-	return len_v3(d2) / len_v3(d1);
+	len_d1 = len_v3(d1);
+
+	return len_d1 != 0.0f ? len_v3(d2) / len_d1 : 1;
 }
 
 /********************** CALC **************************/