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

Button Space: clear pin flag when NULL'ing pointer

Browse Source
This commit is contained in:
Campbell Barton
2015-05-04 16:12:12 +10:00
parent 77e6a001a9
commit c9e5e81064
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/scene.c
View File

@@ -823,6 +823,7 @@ static void scene_unlink_space_buts(SpaceButs *sbuts, Scene *sce)
{
if (sbuts->pinid == &sce->id) {
sbuts->pinid = NULL;
sbuts->flag &= ~SB_PIN_CONTEXT;
}
BKE_spacedata_id_unref((SpaceLink *)sbuts, &sce->id);

6
source/blender/blenloader/intern/readfile.c
View File

@@ -5975,6 +5975,9 @@ static void lib_link_screen(FileData *fd, Main *main)
else if (sl->spacetype == SPACE_BUTS) {
SpaceButs *sbuts = (SpaceButs *)sl;
sbuts->pinid = newlibadr(fd, sc->id.lib, sbuts->pinid);
if (sbuts->pinid == NULL) {
sbuts->flag &= ~SB_PIN_CONTEXT;
}
}
else if (sl->spacetype == SPACE_FILE) {
;
@@ -6304,6 +6307,9 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
else if (sl->spacetype == SPACE_BUTS) {
SpaceButs *sbuts = (SpaceButs *)sl;
sbuts->pinid = restore_pointer_by_name(newmain, sbuts->pinid, USER_IGNORE);
if (sbuts->pinid == NULL) {
sbuts->flag &= ~SB_PIN_CONTEXT;
}
/* TODO: restore path pointers: T40046
* (complicated because this contains data pointers too, not just ID)*/