[Bf-blender-cvs] [163a196f29f] blender-v2.79-release: View3D Remap: skip defmaterial

[Campbell Barton]

Commit: 163a196f29fe1489ebdb70d27eeb05fbc48dab23
Author: Campbell Barton
Date:   Wed Sep 6 20:57:25 2017 +1000
Branches: blender-v2.79-release
https://developer.blender.org/rB163a196f29fe1489ebdb70d27eeb05fbc48dab23

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) */