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, 27 insertions, 51 deletions

diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h
index af535d65d62..2ac2d70b5d1 100644
--- a/source/gameengine/Converter/BlenderWorldInfo.h
+++ b/source/gameengine/Converter/BlenderWorldInfo.h
@@ -36,68 +36,44 @@
 
 class BlenderWorldInfo : public KX_WorldInfo
 {
-	bool			m_hasworld;
-	float			m_backgroundcolor[3];
+	bool m_hasworld;
+	float m_backgroundcolor[3];
 
-	bool			m_hasmist;
-	float			m_miststart;
-	float			m_mistdistance;
-	float			m_mistcolor[3];
+	bool m_hasmist;
+	float m_miststart;
+	float m_mistdistance;
+	float m_mistcolor[3];
 
-	float			m_ambientcolor[3];
+	float m_ambientcolor[3];
 
 public:
-	BlenderWorldInfo(struct Scene *blenderscene, struct World* blenderworld);
+	BlenderWorldInfo(struct Scene *blenderscene, struct World *blenderworld);
 	~BlenderWorldInfo();
 
-	bool	hasWorld();
-	bool	hasMist();
-	float	getBackColorRed();
-	float	getBackColorGreen();
-	float	getBackColorBlue();
-	
-	float	getAmbientColorRed();
-	float	getAmbientColorGreen();
-	float	getAmbientColorBlue();
+	bool hasWorld();
+	bool hasMist();
+	float getBackColorRed();
+	float getBackColorGreen();
+	float getBackColorBlue();
 
-	float	getMistStart();
-	float	getMistDistance();
-	float	getMistColorRed();
-	float	getMistColorGreen();
-	float	getMistColorBlue();
+	float getAmbientColorRed();
+	float getAmbientColorGreen();
+	float getAmbientColorBlue();
 
-	void
-	setBackColor(
-		float r,
-		float g,
-		float b
-	);
-		void
-	setMistStart(
-		float d
-	);
+	float getMistStart();
+	float getMistDistance();
+	float getMistColorRed();
+	float getMistColorGreen();
+	float getMistColorBlue();
 
-		void
-	setMistDistance(
-		float d
-	);
+	void setBackColor(float r, float g, float b);
+	void setMistStart(float d);
+	void setMistDistance(float d);
+	void setMistColorRed(float d);
+	void setMistColorGreen(float d);
+	void setMistColorBlue(float d);
 
-		void
-	setMistColorRed(
-		float d
-	);
 
-		void
-	setMistColorGreen(
-		float d
-	);
-
-		void
-	setMistColorBlue(
-		float d
-	);   
-	
-	
 #ifdef WITH_CXX_GUARDEDALLOC
 	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BlenderWorldInfo")
 #endif