Merge branch 'master' into blender2.8

2016-10-02 18:53:01 +02:00
parent ba30b852f3 3f9b69287d
commit c50ccc8476
42 changed files with 451 additions and 194 deletions
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -294,7 +294,7 @@ static void copy_vert_no(const BVHTreeFromMeshType *meshdata, const int index, f
 		case SNAP_MESH:
 		{
 			BVHTreeFromMesh *data = meshdata->userdata;
-			const MVert *vert = data->vert;
+			const MVert *vert = data->vert + index;
 			normal_short_to_float_v3(r_no, vert->no);
 			break;
 		}
@@ -1302,6 +1302,7 @@ static bool snapDerivedMesh(
 				}
 			}
 		}
+		/* SCE_SNAP_MODE_VERTEX or SCE_SNAP_MODE_EDGE */
 		else {
 			const ARegion *ar = sctx->v3d_data.ar;