griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #21741: changing scenes didn't update layers in 3d view, patch by Elia Sarti.

Browse Source
This commit is contained in:
Brecht Van Lommel
2010-03-27 11:54:38 +00:00
parent 3d5954604d
commit 998ca03989
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/ED_view3d.h
View File

@@ -153,6 +153,7 @@ struct RegionView3D *ED_view3d_context_rv3d(struct bContext *C);
void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d);
void ED_view3d_scene_layers_copy(struct View3D *v3d, struct Scene *scene);
void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene);
int ED_view3d_scene_layer_set(int lay, const int *values);

4
source/blender/editors/screen/screen_edit.c
View File

@@ -49,6 +49,7 @@
#include "WM_types.h"
#include "ED_image.h"
#include "ED_view3d.h"
#include "ED_screen.h"
#include "ED_screen_types.h"
@@ -1387,6 +1388,9 @@ void ED_screen_set_scene(bContext *C, Scene *scene)
while(sl) {
if(sl->spacetype==SPACE_VIEW3D) {
View3D *v3d= (View3D*) sl;
ED_view3d_scene_layers_copy(v3d, scene);
if (!v3d->camera || !object_in_scene(v3d->camera, scene)) {
v3d->camera= scene_find_camera(sc->scene);
// XXX if (sc==curscreen) handle_view3d_lock();

6
source/blender/editors/space_view3d/view3d_view.c
View File

@@ -66,6 +66,7 @@
#include "ED_screen.h"
#include "ED_armature.h"
#include "GPU_draw.h"
#include "PIL_time.h" /* smoothview */
@@ -1415,6 +1416,11 @@ static void copy_view3d_lock_space(View3D *v3d, Scene *scene)
}
}
void ED_view3d_scene_layers_copy(struct View3D *v3d, struct Scene *scene)
{
copy_view3d_lock_space(v3d, scene);
}
void ED_view3d_scene_layers_update(Main *bmain, Scene *scene)
{
bScreen *sc;