Merge branch 'master' into soc-2013-depsgraph_mtsoc-2013-depsgraph_mt

Conflicts:
	source/blender/blenkernel/intern/constraint.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/shrinkwrap.c
	source/blender/collada/AnimationExporter.cpp
	source/blender/editors/space_image/image_ops.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/makesrna/intern/rna_scene.c
	source/blender/modifiers/intern/MOD_util.c
	source/blender/render/intern/source/pipeline.c

1 files changed, 21 insertions, 21 deletions

diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index a64ca5c191e..90b16fe1242 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -46,29 +46,29 @@ public:
 	KX_WorldInfo() {}
 	virtual ~KX_WorldInfo();
 
-	virtual bool	hasWorld()=0;
-	virtual bool	hasMist()=0;
-	virtual float	getBackColorRed()=0;
-	virtual float	getBackColorGreen()=0;
-	virtual float	getBackColorBlue()=0;
-	virtual float	getMistStart()=0;
-	virtual float	getMistDistance()=0;
-	virtual float	getMistColorRed()=0;
-	virtual float	getMistColorGreen()=0;
-	virtual float	getMistColorBlue()=0;
+	virtual bool hasWorld() = 0;
+	virtual bool hasMist() = 0;
+	virtual float getBackColorRed() = 0;
+	virtual float getBackColorGreen() = 0;
+	virtual float getBackColorBlue() = 0;
+	virtual float getMistStart() = 0;
+	virtual float getMistDistance() = 0;
+	virtual float getMistColorRed() = 0;
+	virtual float getMistColorGreen() = 0;
+	virtual float getMistColorBlue() = 0;
+
+	virtual float getAmbientColorRed() = 0;
+	virtual float getAmbientColorGreen() = 0;
+	virtual float getAmbientColorBlue() = 0;
+
+	virtual void setBackColor(float, float, float) = 0;
+	virtual void setMistStart(float) = 0;
+	virtual void setMistDistance(float) = 0;
+	virtual void setMistColorRed(float) = 0;
+	virtual void setMistColorGreen(float) = 0;
+	virtual void setMistColorBlue(float) = 0;
 
-	virtual float	getAmbientColorRed()=0;
-	virtual float	getAmbientColorGreen()=0;
-	virtual float	getAmbientColorBlue()=0;
 
-	virtual void	setBackColor(float,float,float)=0;
-	virtual void	setMistStart(float)=0;
-	virtual void	setMistDistance(float)=0;
-	virtual void	setMistColorRed(float)=0;
-	virtual void	setMistColorGreen(float)=0;
-	virtual void	setMistColorBlue(float)=0;
-	
-	
 #ifdef WITH_CXX_GUARDEDALLOC
 	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_WorldInfo")
 #endif