diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-30 13:28:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-30 13:28:43 +0400 |
| commit | b6ea073af2d244bcec186b5095dccad6ef972e73 (patch) | |
| tree | 451e06a1f2f94ac955afe855d6d9750e4fa0378b /source/blender/blenkernel | |
| parent | 65233bc49e021e0d4609c61242a4005ed0aa133c (diff) | |
more fixes relating to [#36878], freestyle was only checking for NULL linestyles in some places.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/freestyle.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/freestyle.c b/source/blender/blenkernel/intern/freestyle.c index 1f106ff90a7..846b3779649 100644 --- a/source/blender/blenkernel/intern/freestyle.c +++ b/source/blender/blenkernel/intern/freestyle.c @@ -107,7 +107,8 @@ void BKE_freestyle_config_copy(FreestyleConfig *new_config, FreestyleConfig *con static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *lineset) { new_lineset->linestyle = lineset->linestyle; - new_lineset->linestyle->id.us++; + if (lineset->linestyle) + new_lineset->linestyle->id.us++; new_lineset->flags = lineset->flags; new_lineset->selection = lineset->selection; new_lineset->qi = lineset->qi; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 5d0216affca..8c2475369de 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -643,7 +643,9 @@ void BKE_object_unlink(Object *ob) for (lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) { - BKE_unlink_linestyle_target_object(lineset->linestyle, ob); + if (lineset->linestyle) { + BKE_unlink_linestyle_target_object(lineset->linestyle, ob); + } } } } |