Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-10-02 19:53:01 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-10-02 19:53:01 +0300
commitc50ccc847613bbe02bea64cee3f744b449da170c (patch)
treeb4c4bf7ff6de61687691997eb077c28eef0420c7 /source/blender/editors/transform
parentba30b852f317494ad1c2f308295ee28a665e283a (diff)
parent3f9b69287d287af09c801a5203be07287128b2a0 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform_snap_object.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 1b0f5862a44..c8ccb3772c5 100644
--- 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;