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/intern/object.c | |
| parent | 65233bc49e021e0d4609c61242a4005ed0aa133c (diff) | |
more fixes relating to [#36878], freestyle was only checking for NULL linestyles in some places.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); + } } } } |