diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-13 16:54:37 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-13 16:54:37 +0300 |
| commit | b236448386df9ae4145ead2e901e3132ef3ed75a (patch) | |
| tree | 9293d04d1095035614f245221edc37a9fd9ce81b | |
| parent | 9393dd08afd6b3eca03b1c6212a88f945a331dc4 (diff) | |
Two bugfixes, thanks to release candidate tests;
- 1768: edge rotate lacked remaking displaylists
- 1790: outliner crash on delete objects in certain situations, added more
strict pointer check
| -rw-r--r-- | source/blender/src/editmesh_tools.c | 1 | ||||
| -rw-r--r-- | source/blender/src/outliner.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index d668be755e6..617fad3f8f1 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -2658,6 +2658,7 @@ void edge_rotate_selected() EM_select_flush(); allqueue(REDRAWVIEW3D, 0); + makeDispList(G.obedit); BIF_undo_push("Rotate Edge"); } diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 210204135a7..194a1608a06 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -911,7 +911,7 @@ static int tree_element_active_material(SpaceOops *soops, TreeElement *te, int s /* we search for the object parent */ ob= (Object *)outliner_search_back(soops, te, ID_OB); - if(ob!=OBACT) return 0; // just paranoia + if(ob==NULL || ob!=OBACT) return 0; // just paranoia /* searching in ob mat array? */ tes= te->parent; @@ -1029,7 +1029,7 @@ static int tree_element_active_lamp(SpaceOops *soops, TreeElement *te, int set) /* we search for the object parent */ ob= (Object *)outliner_search_back(soops, te, ID_OB); - if(ob!=OBACT) return 0; // just paranoia + if(ob==NULL || ob!=OBACT) return 0; // just paranoia if(set) { extern_set_butspace(F5KEY); @@ -1082,7 +1082,7 @@ static int tree_element_active_ipo(SpaceOops *soops, TreeElement *te, int set) /* we search for the object parent */ ob= (Object *)outliner_search_back(soops, te, ID_OB); - if(ob!=OBACT) return 0; // just paranoia + if(ob==NULL || ob!=OBACT) return 0; // just paranoia /* the parent of ipo */ tes= te->parent; |