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
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-10-22 16:33:18 +0400
committerTon Roosendaal <ton@blender.org>2004-10-22 16:33:18 +0400
commiteecaa4cb50964bfd1bbcc5107fd265082ec96c75 (patch)
tree379452ba2d3a821ece1f6b0b30b24d834f4e46d3 /source
parent461e07aedd0527962b49742e6ab9ac45f7c9ee61 (diff)
Better pointer check in outliner.c for actions, for bassam :)
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/outliner.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c
index c1ef088cf68..38d41a37d7e 100644
--- a/source/blender/src/outliner.c
+++ b/source/blender/src/outliner.c
@@ -1141,14 +1141,18 @@ static int tree_element_active_nla_action(TreeElement *te, TreeStoreElem *tselem
{
if(set) {
bActionStrip *strip= te->directdata;
- deselect_nlachannel_keys(0);
- strip->flag |= ACTSTRIP_SELECT;
- allqueue(REDRAWNLA, 0);
+ if(strip) {
+ deselect_nlachannel_keys(0);
+ strip->flag |= ACTSTRIP_SELECT;
+ allqueue(REDRAWNLA, 0);
+ }
}
else {
/* id in tselem is action */
bActionStrip *strip= te->directdata;
- if(strip->flag & ACTSTRIP_SELECT) return 1;
+ if(strip) {
+ if(strip->flag & ACTSTRIP_SELECT) return 1;
+ }
}
return 0;
}