Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-03-28 11:10:15 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-03-28 11:10:15 +0300
commitbed327f1ce7c64a6e32f610fa26789d69549aaef (patch)
treea6918da0bf23257d58eaf37d687dd9b1a867f29b
parent39172c6f3432cb580f58afb1a55d0a91057830c2 (diff)
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.
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 1 insertions, 2 deletions
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 */
}