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
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-10-01 03:02:29 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-10-01 03:02:29 +0400
commitaaba317c763657d7c309a1c3e96b58f5924afd29 (patch)
tree4faf1cabbfab4f63e4ffe00d42a9bcd3dace83b1 /source/blender/makesrna/intern/rna_scene.c
parente28bd0d3024f6a21adbc1aa74fa87865ae613046 (diff)
Follow-up to r60433 (related to Bug #36878): additional checks for NULL line styles.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index f1a05700bd9..0cfb399c470 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1541,7 +1541,8 @@ static void rna_FreestyleLineSet_linestyle_set(PointerRNA *ptr, PointerRNA value
{
FreestyleLineSet *lineset = (FreestyleLineSet *)ptr->data;
- lineset->linestyle->id.us--;
+ if (lineset->linestyle)
+ lineset->linestyle->id.us--;
lineset->linestyle = (FreestyleLineStyle *)value.data;
lineset->linestyle->id.us++;
}