[Bf-blender-cvs] [56ff14ea631] master: View3D Remap: skip defmaterial
Campbell Barton
noreply at git.blender.org
Wed Sep 6 12:51:23 CEST 2017
Commit: 56ff14ea6318ea7800c991a239fe8b8de6527d08
Author: Campbell Barton
Date: Wed Sep 6 20:57:25 2017 +1000
Branches: master
https://developer.blender.org/rB56ff14ea6318ea7800c991a239fe8b8de6527d08
View3D Remap: skip defmaterial
This isn't library data.
===================================================================
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
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) */
More information about the Bf-blender-cvs
mailing list