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>2013-02-09 16:30:42 +0400
committerTon Roosendaal <ton@blender.org>2013-02-09 16:30:42 +0400
commit00212f2b1f24362837910ea578546b3d93eba4e5 (patch)
tree66c6a06e1292456290e8fc886523ba5d6704034f /source/gameengine/Converter
parentbd9a7ab7688edab142e4c503726f17131153e26a (diff)
Bug fix #34157
Tss tss! :) This bug (since Jan 26) made Material options get cleared on using GE once.
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 8b81abf1728..e5503dfd0a7 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1982,7 +1982,7 @@ static KX_GameObject *gameobject_from_blenderobject(
for (int i=0;i<mesh->totcol;i++) {
mat=mesh->mat[i];
if (!mat) break;
- if ((mat->shade_flag &= MA_OBCOLOR)) {
+ if ((mat->shade_flag & MA_OBCOLOR)) {
bUseObjectColor = true;
break;
}