archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix: Transform Snap

Browse Source 
Would crash if snapping from a mesh in edit mode to a group instance including that same mesh.

Reported by UncleZeiv on IRC
This commit is contained in:
Martin Poirier
2009-01-18 22:09:29 +00:00
parent bae2de3f1a
commit ff52dcbf0d
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/src/transform_snap.c
View File

@@ -1186,10 +1186,21 @@ int snapObjects(int *dist, float *loc, float *no, int mode) {
Object *ob = dupli_ob->ob; Object *ob = dupli_ob->ob;
if (ob->type == OB_MESH) { if (ob->type == OB_MESH) {
DerivedMesh *dm = mesh_get_derived_final(ob, CD_MASK_BAREMESH); DerivedMesh *dm;
int editmesh = 0;
int val; int val;
val = snapDerivedMesh(ob, dm, dupli_ob->mat, ray_start, ray_normal, mval, loc, no, dist, &depth, 0); if (ob == G.obedit)
{
dm = editmesh_get_derived_cage(CD_MASK_BAREMESH);
editmesh = 1;
}
else
{
dm = mesh_get_derived_final(ob, CD_MASK_BAREMESH);
}
val = snapDerivedMesh(ob, dm, dupli_ob->mat, ray_start, ray_normal, mval, loc, no, dist, &depth, editmesh);
retval = retval || val; retval = retval || val;