diff options
| author | Alfredo de Greef <eeshlo@yahoo.com> | 2004-12-05 06:51:01 +0300 |
|---|---|---|
| committer | Alfredo de Greef <eeshlo@yahoo.com> | 2004-12-05 06:51:01 +0300 |
| commit | 263479dfbadc4e99354e0cf54fb6fa21c900fce5 (patch) | |
| tree | 9834b28d9a9d3fac7f27776eef602dfc5f831c76 /source/blender/yafray | |
| parent | ef971de66d946d69114c817b4340b82316c4d108 (diff) | |
Added support for the extra texture channels.
Diffstat (limited to 'source/blender/yafray')
| -rwxr-xr-x | source/blender/yafray/intern/export_File.cpp | 6 | ||||
| -rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 6 | ||||
| -rw-r--r-- | source/blender/yafray/intern/yafray_Render.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index e80c5362baf..18874a36355 100755 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -657,7 +657,7 @@ void yafrayFileRender_t::writeShader(const string &shader_name, Material* matr, xmlfile << ostr.str(); } - for (int m2=0;m2<8;m2++) { + for (int m2=0;m2<MAX_MTEX;m2++) { if (matr->septex & (1<<m2)) continue;// all active channels @@ -807,7 +807,7 @@ void yafrayFileRender_t::writeMaterialsAndModulators() Material* matr = blendmat->second; // mapper(s) - for (int m=0;m<8;m++) + for (int m=0;m<MAX_MTEX;m++) { if (matr->septex & (1<<m)) continue;// all active channels @@ -1650,7 +1650,7 @@ bool yafrayFileRender_t::writeWorld() if (world==NULL) return false; - for (int i=0;i<6;i++) { + for (int i=0;i<MAX_MTEX;i++) { MTex* wtex = world->mtex[i]; if (!wtex) continue; Image* wimg = wtex->tex->ima; diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index 6dd14343830..eff042a3be8 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -644,7 +644,7 @@ void yafrayPluginRender_t::writeShader(const string &shader_name, Material* matr lparams.push_back(mparams); } - for (int m2=0;m2<8;m2++) + for (int m2=0;m2<MAX_MTEX;m2++) { if (matr->septex & (1<<m2)) continue;// all active channels // ignore null mtex @@ -786,7 +786,7 @@ void yafrayPluginRender_t::writeMaterialsAndModulators() { Material* matr = blendmat->second; // mapper(s) - for (int m=0;m<8;m++) + for (int m=0;m<MAX_MTEX;m++) { if (matr->septex & (1<<m)) continue;// all active channels // ignore null mtex @@ -1636,7 +1636,7 @@ bool yafrayPluginRender_t::writeWorld() if (world==NULL) return false; yafray::paramMap_t params; - for (int i=0;i<6;i++) { + for (int i=0;i<MAX_MTEX;i++) { MTex* wtex = world->mtex[i]; if (!wtex) continue; Image* wimg = wtex->tex->ima; diff --git a/source/blender/yafray/intern/yafray_Render.cpp b/source/blender/yafray/intern/yafray_Render.cpp index d80bbf0de6c..1ab2ca29c7f 100644 --- a/source/blender/yafray/intern/yafray_Render.cpp +++ b/source/blender/yafray/intern/yafray_Render.cpp @@ -94,7 +94,7 @@ bool yafrayRender_t::getAllMatTexObs() else used_materials[matr->id.name] = matr; // textures, all active channels - for (int m=0;m<8;m++) { + for (int m=0;m<MAX_MTEX;m++) { if (matr->septex & (1<<m)) continue; // only active channels MTex* mx = matr->mtex[m]; // if no mtex, ignore |