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>2017-05-16 06:01:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-16 06:01:26 +0300
commit57660aac743a70eea0b917ae92dd5d6bdb1b12a9 (patch)
tree59b23a0e8540e72c1d98fed5e5d75d7214482c2e /release
parent5a90542d3d4ba1a193975a3cb9c50eec1f6a8c8a (diff)
parentd508b69e44bb3c5911d7716048c28fe0dc5e609b (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_node.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index b939d34e154..b37b3c5705a 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -428,7 +428,6 @@ class NODE_PT_quality(bpy.types.Panel):
col.prop(tree, "use_groupnode_buffer")
col.prop(tree, "use_two_pass")
col.prop(tree, "use_viewer_border")
- col.prop(snode, "show_highlight")
class NODE_UL_interface_sockets(bpy.types.UIList):