diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-01-24 19:20:04 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-01-24 19:25:22 +0300 |
| commit | 6100dc6a202cb19a13b30210dc4a5afabd3afaa4 (patch) | |
| tree | 747ad7bd1d276234443e5795e09b771d07092ce1 /release | |
| parent | 15bae8ac0050a50904ac4f90e85e4463463b3c5d (diff) | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/object.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 5 |
2 files changed, 5 insertions, 2 deletions
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) |