[Bf-blender-cvs] [bed327f1ce7] master: Bring back `lib_link_mesh()` in 'order' with other libdata liblink functions.
Bastien Montagne
noreply at git.blender.org
Tue Mar 28 10:19:02 CEST 2017
Commit: bed327f1ce7c64a6e32f610fa26789d69549aaef
Author: Bastien Montagne
Date: Tue Mar 28 10:10:15 2017 +0200
Branches: master
https://developer.blender.org/rBbed327f1ce7c64a6e32f610fa26789d69549aaef
Bring back `lib_link_mesh()` in 'order' with other libdata liblink functions.
We do not need any special handling anymore for usercount of images used
by faces/polygons (tpage stuff), since we have the 'real_user' handling,
which will gracefully cope with all possible situations.
So better not keep that ugly confusing useless special case.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 985f646e1e0..706f4a4606e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8457,6 +8457,7 @@ static void lib_link_all(FileData *fd, Main *main)
lib_link_screen(fd, main);
lib_link_scene(fd, main);
lib_link_object(fd, main);
+ lib_link_mesh(fd, main);
lib_link_curve(fd, main);
lib_link_mball(fd, main);
lib_link_material(fd, main);
@@ -8486,8 +8487,6 @@ static void lib_link_all(FileData *fd, Main *main)
lib_link_gpencil(fd, main);
lib_link_cachefiles(fd, main);
- lib_link_mesh(fd, main); /* as last: tpage images with users at zero */
-
lib_link_library(fd, main); /* only init users */
}
More information about the Bf-blender-cvs
mailing list