diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-11 13:09:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-11 13:09:59 +0300 |
| commit | 0c43567a5a1545978c405a4935a039067a20fc92 (patch) | |
| tree | db527d094e6ed72c4ba627fbe0f949ad443242b3 /source/blender/makesrna | |
| parent | 587a16352a331cd8e54faca241e2f723e4c8be2d (diff) | |
| parent | 4370f8ffbde44442855275204689cc9ff3596306 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d169720c02b..9eaff19770a 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -452,6 +452,15 @@ EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, PointerRNA *ptr, P } /* Space 3D View */ +static void rna_SpaceView3D_camera_update(Main *bmain, Scene *scene, PointerRNA *ptr) +{ + View3D *v3d = (View3D *)(ptr->data); + if (v3d->scenelock) { + scene->camera = v3d->camera; + BKE_screen_view3d_main_sync(&bmain->screen, scene); + } +} + static void rna_SpaceView3D_lock_camera_and_layers_set(PointerRNA *ptr, int value) { View3D *v3d = (View3D *)(ptr->data); @@ -2358,7 +2367,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "camera"); RNA_def_property_ui_text(prop, "Camera", "Active camera used in this view (when unlocked from the scene's active camera)"); - RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_camera_update"); /* render border */ prop = RNA_def_property(srna, "use_render_border", PROP_BOOLEAN, PROP_NONE); |