blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

UI: 3D View, View panel: single-column, flow and subpanel 

See D3525
This commit is contained in:
Vuk Gardašević 2018-07-06 18:22:55 +02:00 committed by Pablo Vazquez
parent a48b52d546
commit 4674cffe29
1 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3627,38 +3627,66 @@ class VIEW3D_PT_view3d_properties(Panel):
view = context.space_data
col = layout.column()
col.active = bool(view.region_3d.view_perspective != 'CAMERA' or view.region_quadviews)
col.prop(view, "lens")
col.label(text="Lock to Object:")
col.prop(view, "lock_object", text="")
layout.use_property_split = True
layout.use_property_decorate = False # No animation.
flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True)
col = flow.column()
subcol = col.column()
subcol.active = bool(view.region_3d.view_perspective != 'CAMERA' or view.region_quadviews)
subcol.prop(view, "lens", text="Focal Length")
subcol = col.column(align=True)
subcol.prop(view, "clip_start", text="Clip Start")
subcol.prop(view, "clip_end", text="End")
subcol.separator()
col = flow.column()
subcol = col.column()
subcol.enabled = not view.lock_camera_and_layers
subcol.prop(view, "camera", text="Local Camera")
subcol = col.column(align=True)
subcol.prop(view, "use_render_border")
subcol.active = view.region_3d.view_perspective != 'CAMERA'
class VIEW3D_PT_view3d_camera_lock(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_label = "Camera Lock"
bl_parent_id = "VIEW3D_PT_view3d_properties"
def draw(self, context):
layout = self.layout
layout.use_property_split = True
layout.use_property_decorate = False # No animation.
view = context.space_data
col = layout.column(align=True)
subcol = col.column()
subcol.active = bool(view.region_3d.view_perspective != 'CAMERA' or view.region_quadviews)
subcol.prop(view, "lock_object")
lock_object = view.lock_object
if lock_object:
if lock_object.type == 'ARMATURE':
col.prop_search(view, "lock_bone", lock_object.data,
"edit_bones" if lock_object.mode == 'EDIT'
else "bones",
text="")
subcol.prop_search(
view, "lock_bone", lock_object.data,
"edit_bones" if lock_object.mode == 'EDIT'
else "bones",
text=""
)
else:
col.prop(view, "lock_cursor", text="Lock to Cursor")
subcol.prop(view, "lock_cursor", text="Lock to 3D Cursor")
col = layout.column()
col.prop(view, "lock_camera")
col = layout.column(align=True)
col.label(text="Clip:")
col.prop(view, "clip_start", text="Start")
col.prop(view, "clip_end", text="End")
subcol = col.column(align=True)
subcol.enabled = not view.lock_camera_and_layers
subcol.label(text="Local Camera:")
subcol.prop(view, "camera", text="")
col = layout.column(align=True)
col.prop(view, "use_render_border")
col.active = view.region_3d.view_perspective != 'CAMERA'
class VIEW3D_PT_view3d_cursor(Panel):
bl_space_type = 'VIEW_3D'
@ -4496,6 +4524,7 @@ classes = (
VIEW3D_PT_grease_pencil,
VIEW3D_PT_grease_pencil_palettecolor,
VIEW3D_PT_view3d_properties,
VIEW3D_PT_view3d_camera_lock,
VIEW3D_PT_view3d_cursor,
VIEW3D_PT_quad_view,
VIEW3D_PT_view3d_stereo,