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:
authorMiika Hamalainen <blender@miikah.org>2011-11-07 20:36:49 +0400
committerMiika Hamalainen <blender@miikah.org>2011-11-07 20:36:49 +0400
commitedec46b0a6aac18f406991b9e16228d4bd848c61 (patch)
tree1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/editors/mesh
parent2ed6f077b3952123d56916980d18a379ecb3e5ac (diff)
parent4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff)
Merge with trunk r41625
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh.c5
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 85ac87d8bcb..f6aae0e20ae 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -1181,8 +1181,9 @@ void load_editMesh(Scene *scene, Object *obedit)
eve= em->verts.first;
mvert = me->mvert;
while(eve) {
- if(eve->keyindex>=0)
- VECSUB(ofs[i], mvert->co, fp[eve->keyindex]);
+ if(eve->keyindex>=0) {
+ sub_v3_v3v3(ofs[i], mvert->co, fp[eve->keyindex]);
+ }
eve= eve->next;
i++;
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 99af17c161e..1852d90eed0 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1387,6 +1387,8 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event)
}
}
+ recalc_editnormals(em);
+
EM_fgon_flags(em); // redo flags and indices for fgons
}