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:
authorTon Roosendaal <ton@blender.org>2006-11-27 16:00:50 +0300
committerTon Roosendaal <ton@blender.org>2006-11-27 16:00:50 +0300
commit2e0084c2d9bc53adf0a9589e71ed89841d34eb65 (patch)
tree16e3f3037bf2663e12c6d8a8e1e51db2ee4a9d59 /source/blender/src/editsima.c
parent3ccfa7709eb59c2a048a06d88adb26b1f7596f7c (diff)
IRC reported bug:
When linking a referenced (Library) Image to a texture face, it wasn't tagged to become saved in file. So you lost data. Also fixed: tooltip for the "Li" icons was wrong.
Diffstat (limited to 'source/blender/src/editsima.c')
-rw-r--r--source/blender/src/editsima.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index 46cdcad75db..3e25340048f 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -1560,7 +1560,7 @@ static void image_replace(Image *old, Image *new)
me= G.main->mesh.first;
while(me) {
- if(me->mtface) {
+ if(me->id.lib==NULL && me->mtface) {
tface= me->mtface;
a= me->totface;
while(a--) {
@@ -1575,7 +1575,9 @@ static void image_replace(Image *old, Image *new)
}
if(rep) {
- if(new->id.us==0) new->id.us= 1;
+ if(new->id.us==0) id_us_plus(&new->id);
+ else id_lib_extern(&new->id);
+
}
else error("Nothing replaced");
}