bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

View3D Remap: skip defmaterial

Browse Source 
This isn't library data.
This commit is contained in:
Campbell Barton 2017-09-06 20:57:25 +10:00
parent e54caf76cb
commit 56ff14ea63
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1415,9 +1415,7 @@ static void view3d_id_remap(ScrArea *sa, SpaceLink *slink, ID *old_id, ID *new_i
/* Values in local-view aren't used, see: T52663 */
if (is_local == false) {
if ((ID *)v3d->defmaterial == old_id) {
v3d->defmaterial = (Material *)new_id;
}
/* Skip 'v3d->defmaterial', it's not library data. */
if ((ID *)v3d->ob_centre == old_id) {
v3d->ob_centre = (Object *)new_id;

3
source/blender/makesdna/DNA_view3d_types.h
View File

@ -225,7 +225,8 @@ typedef struct View3D {
struct GPUFXSettings fx_settings;
void *properties_storage; /* Nkey panel stores stuff here (runtime only!) */
struct Material *defmaterial; /* used by matcap now */
/* Allocated per view, not library data (used by matcap). */
struct Material *defmaterial;
/* XXX deprecated? */
struct bGPdata *gpd DNA_DEPRECATED; /* Grease-Pencil Data (annotation layers) */