Commit: ee1f309f254ca5bb9196a23acee856f0f4361232
Author: Germano Cavalcante
Date: Fri Feb 24 14:21:58 2017 -0300
Branches: snap_system_clip_planes
https://developer.blender.org/rBee1f309f254ca5bb9196a23acee856f0f4361232
Merge branch 'snap_system_clip_planes' of g...@git.blender.org:blender.git into
snap_system_clip_planes
# Conflicts:
# source/blender/editors/transform/transform_snap_object.c
===================================================================
===================================================================
diff --cc source/blender/editors/transform/transform_snap_object.c
index 2501489371,b5925aa120..392c88c441
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@@ -1856,7 -1869,11 +1857,6 @@@ static bool snapDerivedMesh
snp_free_nearestdata(&localdata.nearest);
if ((neasrest2d.vert_index != -1) || (neasrest2d.edge_index !=
-1)) {
-
- G_treedata = treedata_lt;
- G_ed_num = dm->getNumEdges(dm);
- G_test_ed("***start***\n", __func__, "");
--
copy_v3_v3(r_loc, neasrest2d.co);
mul_m4_v3(obmat, r_loc);
if (r_no) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
