Merge branch 'master' into blender2.8

This commit is contained in:
2018-07-07 08:53:00 +02:00
4 changed files with 89 additions and 91 deletions

View File

@@ -3617,11 +3617,6 @@ class VIEW3D_PT_view3d_properties(Panel):
bl_region_type = 'UI'
bl_label = "View"
@classmethod
def poll(cls, context):
view = context.space_data
return (view)
def draw(self, context):
layout = self.layout
@@ -3693,11 +3688,6 @@ class VIEW3D_PT_view3d_cursor(Panel):
bl_region_type = 'UI'
bl_label = "3D Cursor"
@classmethod
def poll(cls, context):
view = context.space_data
return (view is not None)
def draw(self, context):
layout = self.layout
layout.use_property_split = True
@@ -3713,10 +3703,6 @@ class VIEW3D_PT_shading(Panel):
bl_label = "Shading"
bl_ui_units_x = 11
@classmethod
def poll(cls, context):
return True
def draw(self, context):
pass
@@ -3727,10 +3713,6 @@ class VIEW3D_PT_shading_lighting(Panel):
bl_label = "Lighting"
bl_parent_id = 'VIEW3D_PT_shading'
@classmethod
def poll(cls, context):
return True
def draw(self, context):
layout = self.layout
@@ -3851,10 +3833,6 @@ class VIEW3D_PT_overlay(Panel):
bl_label = "Overlays"
bl_ui_units_x = 14
@classmethod
def poll(cls, context):
return True
def draw(self, context):
layout = self.layout
@@ -4267,11 +4245,6 @@ class VIEW3D_PT_transform_orientations(Panel):
bl_label = "Transform Orientations"
bl_ui_units_x = 8
@classmethod
def poll(cls, context):
view = context.space_data
return (view)
def draw(self, context):
layout = self.layout
layout.label("Transform Orientations")
@@ -4328,7 +4301,7 @@ class VIEW3D_PT_view3d_stereo(Panel):
scene = context.scene
multiview = scene.render.use_multiview
return context.space_data and multiview
return multiview
def draw(self, context):
layout = self.layout