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
path: root/intern
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-01-24 19:20:04 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-01-24 19:25:22 +0300
commit6100dc6a202cb19a13b30210dc4a5afabd3afaa4 (patch)
tree747ad7bd1d276234443e5795e09b771d07092ce1 /intern
parent15bae8ac0050a50904ac4f90e85e4463463b3c5d (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 'intern')
-rw-r--r--intern/cycles/blender/blender_camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index b41749a7f81..21efba4cdf0 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -648,7 +648,7 @@ static void blender_camera_from_view(BlenderCamera *bcam,
if(b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_CAMERA) {
/* camera view */
- BL::Object b_ob = (b_v3d.lock_camera_and_layers())? b_scene.camera(): b_v3d.camera();
+ BL::Object b_ob = (b_v3d.use_local_camera())? b_v3d.camera(): b_scene.camera();
if(b_ob) {
blender_camera_from_object(bcam, b_engine, b_ob, skip_panorama);
@@ -784,7 +784,7 @@ static void blender_camera_border(BlenderCamera *bcam,
return;
}
- BL::Object b_ob = (b_v3d.lock_camera_and_layers())? b_scene.camera(): b_v3d.camera();
+ BL::Object b_ob = (b_v3d.use_local_camera())? b_v3d.camera(): b_scene.camera();
if(!b_ob)
return;