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:
authorDaniel Stokes <kupomail@gmail.com>2013-10-14 00:59:55 +0400
committerDaniel Stokes <kupomail@gmail.com>2013-10-14 00:59:55 +0400
commit0aa392d2ff4cc29f2e53485a6456a7deb838e1bb (patch)
tree50aa44367f0df077be6115c1f9deb85656018d4d /release/scripts/startup/bl_ui/properties_freestyle.py
parent6167313105cd0b65ba777459ce9333ac51e0cb3b (diff)
parent2ce3bd0d672e7e26e1a8710444872ad6478a7565 (diff)
Merged revisions 60248-60717 from trunk/blendersoc-2013-bge
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_freestyle.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_freestyle.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 18dd8f591e8..a96441a26e5 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -530,6 +530,8 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel,
linestyle = lineset.linestyle
layout.template_ID(lineset, "linestyle", new="scene.freestyle_linestyle_new")
+ if linestyle is None:
+ return
row = layout.row(align=True)
row.prop(linestyle, "panel", expand=True)
if linestyle.panel == 'STROKES':