From 6100dc6a202cb19a13b30210dc4a5afabd3afaa4 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 24 Jan 2019 17:20:04 +0100 Subject: bring back possibility to override camera per view this can now be found in the sidebar View panel - uses existing 'lock_camera_and_layers' but renames the property to 'use_local_camera' - uses RNA_def_property_boolean_negative_sdna to flip the value - remove the local view code in rna_SpaceView3D_lock_camera_and_layers_set - update Python code - update Addons code will be separate commit Fixes T60756 Reviewers: billreynish, brecht Maniphest Tasks: T60756 Differential Revision: https://developer.blender.org/D4247 --- release/scripts/startup/bl_operators/object.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index d4085d70143..c945d15267a 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -133,7 +133,7 @@ class SelectCamera(Operator): scene = context.scene view_layer = context.view_layer view = context.space_data - if view.type == 'VIEW_3D' and not view.lock_camera_and_layers: + if view.type == 'VIEW_3D' and view.use_local_camera: camera = view.camera else: camera = scene.camera diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index f0bbc1d39dc..5e42e0b655b 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4206,7 +4206,10 @@ class VIEW3D_PT_view3d_properties(Panel): col = flow.column() subcol = col.column() - subcol.enabled = not view.lock_camera_and_layers + subcol.prop(view, "use_local_camera") + + subcol = col.column() + subcol.enabled = view.use_local_camera subcol.prop(view, "camera", text="Local Camera") subcol = col.column(align=True) -- cgit v1.2.3