diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
commit | 908b6960c01ffb1665af56ff6f03aaa3eac5366a (patch) | |
tree | db609864fbe601073212b4c37541a7965ea96ea5 /source/blender/collada/EffectExporter.h | |
parent | d352a0adc5dadd0bfdc3b1b1ac76d92be689966b (diff) | |
parent | a25c11fd8d602236f36c34c342453149bdc1d909 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/EffectExporter.h')
-rw-r--r-- | source/blender/collada/EffectExporter.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/EffectExporter.h b/source/blender/collada/EffectExporter.h index eac428ae330..a1395bfde9f 100644 --- a/source/blender/collada/EffectExporter.h +++ b/source/blender/collada/EffectExporter.h @@ -50,25 +50,25 @@ public: void exportEffects(Scene *sce); void operator()(Material *ma, Object *ob); - + COLLADASW::ColorOrTexture createTexture(Image *ima, std::string& uv_layer_name, COLLADASW::Sampler *sampler /*COLLADASW::Surface *surface*/); - + COLLADASW::ColorOrTexture getcol(float r, float g, float b, float a); private: void writeLambert(COLLADASW::EffectProfile &ep, Material *ma); void writeTextures(COLLADASW::EffectProfile &ep, std::string &key, - COLLADASW::Sampler *sampler, + COLLADASW::Sampler *sampler, MTex *t, Image *ima, std::string &uvname ); bool hasEffects(Scene *sce); - + const ExportSettings *export_settings; - + Scene *scene; }; |