Merge branch 'master' into blender2.8

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;
 };