diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-06 13:57:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-08 12:52:00 +0300 |
| commit | 163a196f29fe1489ebdb70d27eeb05fbc48dab23 (patch) | |
| tree | b29a2d38694fe6bc69ef3569a5a424915b7686cc | |
| parent | b895c7337e7809b782d895cd9a0be9b8200786d4 (diff) | |
View3D Remap: skip defmaterial
This isn't library data.
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index d993f91d7fb..996506a9cf7 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -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; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 4c243507e82..b9894d46b5b 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -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) */ |