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:
authorAntonioya <blendergit@gmail.com>2019-03-04 19:05:44 +0300
committerAntonioya <blendergit@gmail.com>2019-03-04 19:06:03 +0300
commitf6bafef1e1a84ce5b5fcdbc1e53e3341d4433f3b (patch)
treeef6ee5c6a365153d0dfadfa09795382ecb7aae65 /release/scripts/startup/bl_ui/properties_data_gpencil.py
parentb27ada979ce3b41d0e44fabf354df3d572ea2cfa (diff)
GPencil: Move Object Depth Order to Object
There was a conflict between Object "In Front" and how the strokes were managed in Stroke panel for grease pencil datablock. In order to keep consistency, the order of the object has been moved to Object level and now it's using the standard "In Front" flag. As all it is 3D, the option "Back" has been removed. This also fixes the problem with task T62137. Also related to commit 54ffc4e19dc4 and D4405
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_gpencil.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_gpencil.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index b8b197ac3ac..d383982f61e 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -347,9 +347,9 @@ class DATA_PT_gpencil_strokes(DataButtonsPanel, Panel):
gpd = context.gpencil_data
- layout.prop(gpd, "object_depth_order")
- if gpd.object_depth_order == '3DSPACE':
- layout.prop(gpd, "stroke_depth_order")
+ col = layout.column(align=True)
+ col.prop(gpd, "stroke_depth_order")
+ col.enabled = not ob.show_in_front
col = layout.column(align=True)
col.prop(gpd, "stroke_thickness_space")