Commit: 87c38a2ed7dac865ea9941342ad254efa46c2b64
Author: Antonio Vazquez
Date: Thu Apr 26 16:08:51 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB87c38a2ed7dac865ea9941342ad254efa46c2b64
Remove newdataadr and use newlibadr_us for images
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 0b7b09bf18a..afacc4acc6a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4110,14 +4110,13 @@ static void lib_link_material(FileData *fd, Main *main)
}
/* relink grease pencil settings */
- ma->gpcolor = newdataadr(fd, ma->gpcolor);
if (ma->gpcolor != NULL) {
GpencilColorData *gpcolor = ma->gpcolor;
if (gpcolor->sima != NULL) {
- gpcolor->sima = newlibadr(fd,
ma->id.lib, gpcolor->sima);
+ gpcolor->sima = newlibadr_us(fd,
ma->id.lib, gpcolor->sima);
}
if (gpcolor->ima != NULL) {
- gpcolor->ima = newlibadr(fd,
ma->id.lib, gpcolor->ima);
+ gpcolor->ima = newlibadr_us(fd,
ma->id.lib, gpcolor->ima);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
