blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Fix T52663: Remap used invalid local-view data 

Only the camera from View3D.localvd is used,
other pointers may be invalid.

Longer term we should probably clear these to ensure no accidents.
For now just follow the rest of Blender's code and don't access.
This commit is contained in:
Campbell Barton 2017-09-06 20:52:49 +10:00 committed by Bastien Montagne
parent a8bd08ffdd
commit b895c7337e
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/blender/editors/space_view3d/space_view3d.c
View File

@ -1412,33 +1412,33 @@ static void view3d_id_remap(ScrArea *sa, SpaceLink *slink, ID *old_id, ID *new_i
}
}
}
if ((ID *)v3d->ob_centre == old_id) {
v3d->ob_centre = (Object *)new_id;
if (new_id == NULL) { /* Otherwise, bonename may remain valid... We could be smart and check this, too? */
v3d->ob_centre_bone[0] = '\0';
/* Values in local-view aren't used, see: T52663 */
if (is_local == false) {
if ((ID *)v3d->defmaterial == old_id) {
v3d->defmaterial = (Material *)new_id;
}
}
if ((ID *)v3d->defmaterial == old_id) {
v3d->defmaterial = (Material *)new_id;
}
#if 0 /* XXX Deprecated? */
if ((ID *)v3d->gpd == old_id) {
v3d->gpd = (bGPData *)new_id;
}
#endif
if (ELEM(GS(old_id->name), ID_IM, ID_MC)) {
for (BGpic *bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
if ((ID *)bgpic->ima == old_id) {
bgpic->ima = (Image *)new_id;
id_us_min(old_id);
id_us_plus(new_id);
if ((ID *)v3d->ob_centre == old_id) {
v3d->ob_centre = (Object *)new_id;
/* Otherwise, bonename may remain valid... We could be smart and check this, too? */
if (new_id == NULL) {
v3d->ob_centre_bone[0] = '\0';
}
if ((ID *)bgpic->clip == old_id) {
bgpic->clip = (MovieClip *)new_id;
id_us_min(old_id);
id_us_plus(new_id);
}
if (ELEM(GS(old_id->name), ID_IM, ID_MC)) {
for (BGpic *bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
if ((ID *)bgpic->ima == old_id) {
bgpic->ima = (Image *)new_id;
id_us_min(old_id);
id_us_plus(new_id);
}
if ((ID *)bgpic->clip == old_id) {
bgpic->clip = (MovieClip *)new_id;
id_us_min(old_id);
id_us_plus(new_id);
}
}
}
}