griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix regression [#36878], missing NULL checks for linestyle.

Browse Source
This commit is contained in:
Campbell Barton
2013-09-30 08:43:22 +00:00
parent be654aab58
commit 8064989e7b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_outliner/outliner_tree.c
View File

@@ -384,17 +384,21 @@ static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce,
for (srl = sce->r.layers.first; srl; srl = srl->next) {
for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
lineset->linestyle->id.flag |= LIB_DOIT;
FreestyleLineStyle *linestyle = lineset->linestyle;
if (linestyle) {
linestyle->id.flag |= LIB_DOIT;
}
}
}
for (srl = sce->r.layers.first; srl; srl = srl->next) {
for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
FreestyleLineStyle *linestyle = lineset->linestyle;
if (!(linestyle->id.flag & LIB_DOIT))
continue;
linestyle->id.flag &= ~LIB_DOIT;
outliner_add_element(soops, lb, linestyle, te, 0, 0);
if (linestyle) {
if (!(linestyle->id.flag & LIB_DOIT))
continue;
linestyle->id.flag &= ~LIB_DOIT;
outliner_add_element(soops, lb, linestyle, te, 0, 0);
}
}
}
}