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>2012-11-12 22:07:33 +0400
committerTon Roosendaal <ton@blender.org>2012-11-12 22:07:33 +0400
commitf0caab41b22744c97352a7f710f7dde4c163194f (patch)
tree51fcf8930dde6e06d00d5f18c82e0474bc1934a9
parent66aa7e9192921207445ae6ab5807b15ccd8e8b3b (diff)
Bugfix #33147
Conversion from 2.49 and older files: support for unlimited materials on objects had an error in conversion. Effect was that you couldn't re-assign material slots a Material, in case you were using "link to object" option.
-rw-r--r--source/blender/blenloader/intern/versioning_250.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index d75339252d9..1521739258e 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -901,7 +901,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
ob->matbits = MEM_callocN(sizeof(char)*ob->totcol, "ob->matbits");
for (a = 0; a < ob->totcol; a++)
- ob->matbits[a] = ob->colbits & (1<<a);
+ ob->matbits[a] = (ob->colbits & (1<<a)) != 0;
}
}