diff options
author | Ton Roosendaal <ton@blender.org> | 2004-11-16 18:08:42 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-11-16 18:08:42 +0300 |
commit | 32c95ccae440ac4b4996706743469e4101eac932 (patch) | |
tree | a1c94fd277b6eb58288c32a8f2536550567b1639 /source | |
parent | 1e7370c535fed7c7a8ee86990081a8d076df88c9 (diff) |
Three bugfixes, as reported on release;
- loopselect doesnt work proper with vertices outside window
- outliner crash on script select (potential showstopper...)
- make curve parent menu, press ESC, crashed blender
All minimal changes in code. no new development, promised!
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/editmesh_loop.c | 5 | ||||
-rw-r--r-- | source/blender/src/editobject.c | 4 | ||||
-rw-r--r-- | source/blender/src/outliner.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/src/editmesh_loop.c b/source/blender/src/editmesh_loop.c index c6afd55f6c4..2976b2c3cfb 100644 --- a/source/blender/src/editmesh_loop.c +++ b/source/blender/src/editmesh_loop.c @@ -746,7 +746,7 @@ void loopoperations(char mode) if ((G.obedit==0) || (em->faces.first==0)) return; SetBlenderCursor(BC_VLOOPCURSOR); - + /* Clear flags */ for(eed=em->edges.first; eed; eed=eed->next) eed->f2= 0; for(efa= em->faces.first; efa; efa=efa->next) efa->f1= 0; @@ -1646,6 +1646,9 @@ void loopoperations(char mode) } + /* window coords, no clip with vertices f2 flags set (not used) */ + calc_meshverts_ext_f2(); + /* Determine the % on wich the loop should be cut */ getmouseco_areawin(mval); diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 93821bc2c09..a38a6b44f5a 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -1130,7 +1130,7 @@ void make_parent(void) bFollowPathConstraint *data; mode= pupmenu("Make Parent %t|Normal Parent %x1|Follow Path %x2|Curve Deform %x3"); - if(mode==0){ + if(mode<=0){ return; } else if(mode==1) { @@ -1228,7 +1228,7 @@ void make_parent(void) return; } } - else { + else { if(qual & LR_SHIFTKEY) { if(okee("Make parent without inverse")==0) return; } diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 194a1608a06..7db1318d214 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -1225,7 +1225,7 @@ static int tree_element_active_text(SpaceOops *soops, TreeElement *te, int set) if(set) { st->text= (Text *)tselem->id; - pop_space_text(st); + st->top= 0; scrarea_queue_redraw(sa); } else if(st->text==(Text *)tselem->id) return 1; |