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:
authorChris Want <cwant@ualberta.ca>2006-06-12 05:59:50 +0400
committerChris Want <cwant@ualberta.ca>2006-06-12 05:59:50 +0400
commit199cece516ca27468b3d10623955e67c2ed4db48 (patch)
treea0f84c60f525842e4ec8afccabed295ed196cc9c /source/blender/src/editmesh_lib.c
parent22255076231688d27286cfbf3c5d0e7753b91389 (diff)
In the previous mirror+clipping+extrude commit there was a potential
for a crash since the list of modifiers was being accessed before testing whether we are actually in editmode (thanks Ben Batt).
Diffstat (limited to 'source/blender/src/editmesh_lib.c')
-rw-r--r--source/blender/src/editmesh_lib.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c
index 71903f1d437..aa10654a2d8 100644
--- a/source/blender/src/editmesh_lib.c
+++ b/source/blender/src/editmesh_lib.c
@@ -942,9 +942,11 @@ static short extrudeflag_edge(short flag, float *nor)
EditEdge *eed, *nexted;
EditFace *efa, *nextfa;
short del_old= 0;
- ModifierData *md= G.obedit->modifiers.first;
+ ModifierData *md;
if(G.obedit==0 || get_mesh(G.obedit)==0) return 0;
+
+ md = G.obedit->modifiers.first;
/* selected edges with 0 or 1 selected face become faces */
/* selected faces generate new faces */
@@ -1177,10 +1179,12 @@ short extrudeflag_vert(short flag, float *nor)
EditEdge *eed, *e1, *e2, *e3, *e4, *nexted;
EditFace *efa, *efa2, *nextvl;
short sel=0, del_old= 0, is_face_sel=0;
- ModifierData *md= G.obedit->modifiers.first;
+ ModifierData *md;
if(G.obedit==0 || get_mesh(G.obedit)==0) return 0;
+ md = G.obedit->modifiers.first;
+
/* clear vert flag f1, we use this to detect a loose selected vertice */
eve= em->verts.first;
while(eve) {