diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-29 17:16:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-29 17:16:11 +0400 |
| commit | 8f89e7a309fa88bba05d65d8828d20322f0a25ab (patch) | |
| tree | f757f71fe64121825ade91b5ad551ef2c62a84b6 /source/blender/collada/EffectExporter.cpp | |
| parent | d86d68d4e64f7af9c6675481bd96d998620a353f (diff) | |
incorrectly had CMake storing directory names as filepaths
also correct compiler warning for collada and remove print from own last commit.
Diffstat (limited to 'source/blender/collada/EffectExporter.cpp')
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 0bbf714137e..74756859d3b 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -273,7 +273,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob) std::string uvname = strlen(t->uvname) ? t->uvname : active_uv; // color - if (t->mapto & MAP_COL | MAP_COLSPEC) { + if (t->mapto & (MAP_COL | MAP_COLSPEC)) { ep.setDiffuse(createTexture(ima, uvname, sampler)); } // ambient |