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:
authorCampbell Barton <ideasman42@gmail.com>2018-12-17 09:26:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-17 09:32:42 +0300
commit8ec7429a70cca85dd3bc7f29f1ac5030aec7054f (patch)
tree34c1e703cdb3998f8ae5d3d0f2340afa828327a5 /release/scripts/startup/bl_ui/properties_grease_pencil_common.py
parent7fac1bfc203198583eb2e65caedec6b32c24484f (diff)
parent42b9df5907d041a5a68585308b1e11b2eac2c947 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_grease_pencil_common.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 0f098bcc129..8ba0ac6303c 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -33,7 +33,7 @@ def gpencil_stroke_placement_settings(context, layout):
else:
propname = "annotation_stroke_placement_view2d"
- ts = context.tool_settings
+ tool_settings = context.tool_settings
col = layout.column(align=True)