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/blenkernel/intern/freestyle.c
parente28bd0d3024f6a21adbc1aa74fa87865ae613046 (diff)
Follow-up to r60433 (related to Bug #36878): additional checks for NULL line styles.
Diffstat (limited to 'source/blender/blenkernel/intern/freestyle.c')
-rw-r--r--source/blender/blenkernel/intern/freestyle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/freestyle.c b/source/blender/blenkernel/intern/freestyle.c
index 846b3779649..d87c93310c8 100644
--- a/source/blender/blenkernel/intern/freestyle.c
+++ b/source/blender/blenkernel/intern/freestyle.c
@@ -107,7 +107,7 @@ void BKE_freestyle_config_copy(FreestyleConfig *new_config, FreestyleConfig *con
static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *lineset)
{
new_lineset->linestyle = lineset->linestyle;
- if (lineset->linestyle)
+ if (new_lineset->linestyle)
new_lineset->linestyle->id.us++;
new_lineset->flags = lineset->flags;
new_lineset->selection = lineset->selection;