[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37661] trunk/blender/source/blender/ collada/LightExporter.cpp: Remove redundant e usage.

[Nathan Letwory]

Revision: 37661
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37661
Author:   jesterking
Date:     2011-06-20 10:22:39 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Remove redundant e usage. Energy is already multiplied into exported light. Fixes potential bug (e used uninitialised, reported by Campbell Barton on IRC).

Modified Paths:
--------------
    trunk/blender/source/blender/collada/LightExporter.cpp

Modified: trunk/blender/source/blender/collada/LightExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/LightExporter.cpp	2011-06-20 10:07:46 UTC (rev 37660)
+++ trunk/blender/source/blender/collada/LightExporter.cpp	2011-06-20 10:22:39 UTC (rev 37661)
@@ -67,7 +67,7 @@
 	std::string la_id(get_light_id(ob));
 	std::string la_name(id_name(la));
 	COLLADASW::Color col(la->r * la->energy, la->g * la->energy, la->b * la->energy);
-	float e, d, constatt, linatt, quadatt;
+	float d, constatt, linatt, quadatt;
 	
 	d = la->dist;
 	
@@ -84,7 +84,7 @@
 	
 	// sun
 	if (la->type == LA_SUN) {
-		COLLADASW::DirectionalLight cla(mSW, la_id, la_name, e);
+		COLLADASW::DirectionalLight cla(mSW, la_id, la_name);
 		cla.setColor(col);
 		cla.setConstantAttenuation(constatt);
 		exportBlenderProfile(cla, la);
@@ -92,7 +92,7 @@
 	}
 	// hemi
 	else if (la->type == LA_HEMI) {
-		COLLADASW::AmbientLight cla(mSW, la_id, la_name, e);
+		COLLADASW::AmbientLight cla(mSW, la_id, la_name);
 		cla.setColor(col);
 		cla.setConstantAttenuation(constatt);
 		exportBlenderProfile(cla, la);
@@ -100,7 +100,7 @@
 	}
 	// spot
 	else if (la->type == LA_SPOT) {
-		COLLADASW::SpotLight cla(mSW, la_id, la_name, e);
+		COLLADASW::SpotLight cla(mSW, la_id, la_name);
 		cla.setColor(col);
 		cla.setFallOffAngle(la->spotsize);
 		cla.setFallOffExponent(la->spotblend);
@@ -112,7 +112,7 @@
 	}
 	// lamp
 	else if (la->type == LA_LOCAL) {
-		COLLADASW::PointLight cla(mSW, la_id, la_name, e);
+		COLLADASW::PointLight cla(mSW, la_id, la_name);
 		cla.setColor(col);
 		cla.setConstantAttenuation(constatt);
 		cla.setLinearAttenuation(linatt);
@@ -123,7 +123,7 @@
 	// area lamp is not supported
 	// it will be exported as a local lamp
 	else {
-		COLLADASW::PointLight cla(mSW, la_id, la_name, e);
+		COLLADASW::PointLight cla(mSW, la_id, la_name);
 		cla.setColor(col);
 		cla.setConstantAttenuation(constatt);
 		cla.setLinearAttenuation(linatt);