style cleanup: whitespace, also add '?' to save over popup since it wasnt totally clear it was a question (user pointed this out, they thought it was just notification and lost their work).

16 files changed, 195 insertions, 195 deletions

diff --git a/intern/audaspace/FX/AUD_ButterworthFactory.h b/intern/audaspace/FX/AUD_ButterworthFactory.h
index d3606270154..dc8b4d92775 100644
--- a/intern/audaspace/FX/AUD_ButterworthFactory.h
+++ b/intern/audaspace/FX/AUD_ButterworthFactory.h
@@ -56,8 +56,8 @@ public:
 	AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory, float frequency);
 
 	virtual void recalculateCoefficients(AUD_SampleRate rate,
-										 std::vector<float>& b,
-										 std::vector<float>& a);
+	                                     std::vector<float>& b,
+	                                     std::vector<float>& a);
 };
 
 #endif //__AUD_BUTTERWORTHFACTORY_H__
diff --git a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
index fef379f68b1..5b297db2d56 100644
--- a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
+++ b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
@@ -56,8 +56,8 @@ public:
 	 * \param[out] a The output filter coefficients.
 	 */
 	virtual void recalculateCoefficients(AUD_SampleRate rate,
-										 std::vector<float>& b,
-										 std::vector<float>& a)=0;
+	                                     std::vector<float>& b,
+	                                     std::vector<float>& a)=0;
 };
 
 #endif // __AUD_DYNAMICIIRFILTERFACTORY_H__
diff --git a/intern/audaspace/FX/AUD_FaderFactory.h b/intern/audaspace/FX/AUD_FaderFactory.h
index 8fcd4baa623..82eaf2fae9f 100644
--- a/intern/audaspace/FX/AUD_FaderFactory.h
+++ b/intern/audaspace/FX/AUD_FaderFactory.h
@@ -68,8 +68,8 @@ public:
 	 * \param length How long fading should last in seconds.
 	 */
 	AUD_FaderFactory(AUD_Reference<AUD_IFactory> factory,
-					  AUD_FadeType type = AUD_FADE_IN,
-					  float start = 0.0f, float length = 1.0f);
+	                 AUD_FadeType type = AUD_FADE_IN,
+	                 float start = 0.0f, float length = 1.0f);
 
 	/**
 	 * Returns the fading type.
diff --git a/intern/audaspace/intern/AUD_3DMath.h b/intern/audaspace/intern/AUD_3DMath.h
index f39566958cd..1b109ebee1e 100644
--- a/intern/audaspace/intern/AUD_3DMath.h
+++ b/intern/audaspace/intern/AUD_3DMath.h
@@ -136,8 +136,8 @@ public:
 	inline AUD_Vector3 cross(const AUD_Vector3& op) const
 	{
 		return AUD_Vector3(m_y * op.m_z - m_z * op.m_y,
-						   m_z * op.m_x - m_x * op.m_z,
-						   m_x * op.m_y - m_y * op.m_x);
+		                   m_z * op.m_x - m_x * op.m_z,
+		                   m_x * op.m_y - m_y * op.m_x);
 	}
 
 	/**
diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h
index 66e6984c71b..6af0c648d0e 100644
--- a/intern/audaspace/intern/AUD_C-API.h
+++ b/intern/audaspace/intern/AUD_C-API.h
@@ -442,10 +442,10 @@ extern void AUD_closeReadDevice(AUD_Device* device);
  * The sound is therefore bandpassed, rectified and resampled.
  */
 extern float* AUD_readSoundBuffer(const char* filename, float low, float high,
-								  float attack, float release, float threshold,
-								  int accumulate, int additive, int square,
-								  float sthreshold, double samplerate,
-								  int* length);
+                                  float attack, float release, float threshold,
+                                  int accumulate, int additive, int square,
+                                  float sthreshold, double samplerate,
+                                  int* length);
 
 /**
  * Pauses a playing sound after a specific amount of time.
@@ -493,7 +493,7 @@ extern void AUD_setSequencerFPS(AUD_Sound* sequencer, float fps);
  * \return The entry added.
  */
 extern AUD_SEntry* AUD_addSequence(AUD_Sound* sequencer, AUD_Sound* sound,
-								   float begin, float end, float skip);
+                                   float begin, float end, float skip);
 
 /**
  * Removes an entry from the scene.
@@ -567,8 +567,8 @@ extern void AUD_setSequencerAnimData(AUD_Sound* sequencer, AUD_AnimateableProper
  * \param cone_volume_outer The volume outside the outer cone.
  */
 extern void AUD_updateSequenceData(AUD_SEntry* entry, float volume_max, float volume_min,
-								   float distance_max, float distance_reference, float attenuation,
-								   float cone_angle_outer, float cone_angle_inner, float cone_volume_outer);
+                                   float distance_max, float distance_reference, float attenuation,
+                                   float cone_angle_outer, float cone_angle_inner, float cone_volume_outer);
 
 /**
  * Updates all non-animated parameters of the entry.
@@ -578,7 +578,7 @@ extern void AUD_updateSequenceData(AUD_SEntry* entry, float volume_max, float vo
  * \param model The distance model for distance calculation.
  */
 extern void AUD_updateSequencerData(AUD_Sound* sequencer, float speed_of_sound,
-									float factor, AUD_DistanceModel model);
+                                    float factor, AUD_DistanceModel model);
 
 /**
  * Sets the audio output specification of the sound scene to the specs of the
diff --git a/intern/boolop/intern/BOP_BSPNode.h b/intern/boolop/intern/BOP_BSPNode.h
index e8646cd904c..6c110416dd7 100644
--- a/intern/boolop/intern/BOP_BSPNode.h
+++ b/intern/boolop/intern/BOP_BSPNode.h
@@ -52,43 +52,43 @@ public:
 	// Construction methods
 	BOP_BSPNode(const MT_Plane3& plane);
 	~BOP_BSPNode();
-	unsigned int addFace(const BOP_BSPPoints& pts, 
-						 const MT_Plane3& plane);
-	BOP_TAG classifyFace(const MT_Point3& p1, 
-						 const MT_Point3& p2, 
-						 const MT_Point3& p3, 
-						 const MT_Plane3& plane) const;
-	BOP_TAG simplifiedClassifyFace(const MT_Point3& p1, 
-								   const MT_Point3& p2, 
-								   const MT_Point3& p3, 
-								   const MT_Plane3& plane) const;
+	unsigned int addFace(const BOP_BSPPoints& pts,
+	                     const MT_Plane3& plane);
+	BOP_TAG classifyFace(const MT_Point3& p1,
+	                     const MT_Point3& p2,
+	                     const MT_Point3& p3,
+	                     const MT_Plane3& plane) const;
+	BOP_TAG simplifiedClassifyFace(const MT_Point3& p1,
+	                               const MT_Point3& p2,
+	                               const MT_Point3& p3,
+	                               const MT_Plane3& plane) const;
 	
 protected:
 	BOP_TAG testPoint(const MT_Point3& p) const;
-	BOP_TAG classifyFaceIN(const MT_Point3& p1, 
-						   const MT_Point3& p2, 
-						   const MT_Point3& p3, 
-						   const MT_Plane3& plane) const;
-	BOP_TAG classifyFaceOUT(const MT_Point3& p1, 
-							const MT_Point3& p2, 
-							const MT_Point3& p3, 
-							const MT_Plane3& plane) const;
-	BOP_TAG simplifiedClassifyFaceIN(const MT_Point3& p1, 
-									 const MT_Point3& p2, 
-									 const MT_Point3& p3, 
-									 const MT_Plane3& plane) const;
-	BOP_TAG simplifiedClassifyFaceOUT(const MT_Point3& p1, 
-									  const MT_Point3& p2, 
-									  const MT_Point3& p3, 
-									  const MT_Plane3& plane) const;
+	BOP_TAG classifyFaceIN(const MT_Point3& p1,
+	                       const MT_Point3& p2,
+	                       const MT_Point3& p3,
+	                       const MT_Plane3& plane) const;
+	BOP_TAG classifyFaceOUT(const MT_Point3& p1,
+	                        const MT_Point3& p2,
+	                        const MT_Point3& p3,
+	                        const MT_Plane3& plane) const;
+	BOP_TAG simplifiedClassifyFaceIN(const MT_Point3& p1,
+	                                 const MT_Point3& p2,
+	                                 const MT_Point3& p3,
+	                                 const MT_Plane3& plane) const;
+	BOP_TAG simplifiedClassifyFaceOUT(const MT_Point3& p1,
+	                                  const MT_Point3& p2,
+	                                  const MT_Point3& p3,
+	                                  const MT_Plane3& plane) const;
 	bool hasSameOrientation(const MT_Plane3& plane) const;
 	int compChildren() const;
-	int splitTriangle(MT_Point3* res, 
-					  const MT_Plane3& plane, 
-					  const MT_Point3& p1, 
-					  const MT_Point3& p2, 
-					  const MT_Point3& p3, 
-					  const BOP_TAG tag) const;
+	int splitTriangle(MT_Point3* res,
+	                  const MT_Plane3& plane,
+	                  const MT_Point3& p1,
+	                  const MT_Point3& p2,
+	                  const MT_Point3& p3,
+	                  const BOP_TAG tag) const;
 
 public:
 	// Inline acces methods
diff --git a/intern/boolop/intern/BOP_BSPTree.h b/intern/boolop/intern/BOP_BSPTree.h
index b3abd55bf2a..5dc55e47175 100644
--- a/intern/boolop/intern/BOP_BSPTree.h
+++ b/intern/boolop/intern/BOP_BSPTree.h
@@ -50,22 +50,22 @@ public:
 	virtual ~BOP_BSPTree();
 	void addMesh(BOP_Mesh* mesh, BOP_Faces& facesList);
 	void addFace(BOP_Mesh* mesh, BOP_Face* face);
-	virtual void addFace(const MT_Point3& p1, 
-						 const MT_Point3& p2, 
-						 const MT_Point3& p3, 
-						 const MT_Plane3& plane);
-	BOP_TAG classifyFace(const MT_Point3& p1, 
-						 const MT_Point3& p2, 
-						 const MT_Point3& p3, 
-						 const MT_Plane3& plane) const;
-	BOP_TAG filterFace(const MT_Point3& p1, 
-					   const MT_Point3& p2, 
-					   const MT_Point3& p3, 
-					   BOP_Face* face);
-	BOP_TAG simplifiedClassifyFace(const MT_Point3& p1, 
-								   const MT_Point3& p2, 
-								   const MT_Point3& p3, 
-								   const MT_Plane3& plane) const;
+	virtual void addFace(const MT_Point3& p1,
+	                     const MT_Point3& p2,
+	                     const MT_Point3& p3,
+	                     const MT_Plane3& plane);
+	BOP_TAG classifyFace(const MT_Point3& p1,
+	                     const MT_Point3& p2,
+	                     const MT_Point3& p3,
+	                     const MT_Plane3& plane) const;
+	BOP_TAG filterFace(const MT_Point3& p1,
+	                   const MT_Point3& p2,
+	                   const MT_Point3& p3,
+	                   BOP_Face* face);
+	BOP_TAG simplifiedClassifyFace(const MT_Point3& p1,
+	                               const MT_Point3& p2,
+	                               const MT_Point3& p3,
+	                               const MT_Plane3& plane) const;
 	unsigned int getDeep() const;
 	void print();
 	inline void setRoot(BOP_BSPNode* root) {m_root=root;};
diff --git a/intern/cycles/kernel/kernel_montecarlo.h b/intern/cycles/kernel/kernel_montecarlo.h
index 939f3915b6c..afc53b1117a 100644
--- a/intern/cycles/kernel/kernel_montecarlo.h
+++ b/intern/cycles/kernel/kernel_montecarlo.h
@@ -87,8 +87,8 @@ __device_inline void sample_cos_hemisphere(const float3 N,
 }
 
 __device_inline void sample_uniform_hemisphere(const float3 N,
-											 float randu, float randv,
-											 float3 *omega_in, float *pdf)
+                                               float randu, float randv,
+                                               float3 *omega_in, float *pdf)
 {
 	float z = randu;
 	float r = sqrtf(max(0.0f, 1.0f - z*z));
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index 5005718e4a5..b606294e97d 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -278,7 +278,7 @@ public:
 	                                            GHOST_TUns8 mask[16][2],
 	                                            int hotX,
 	                                            int hotY) = 0;
-												
+
 	virtual GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 *bitmap, 
 	                                            GHOST_TUns8 *mask,
 	                                            int sizex, int sizey,
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 7bd9f75b2dd..93b5e748987 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -88,8 +88,8 @@ typedef struct bNodeSocketTemplate {
 } bNodeSocketTemplate;
 
 typedef void (*NodeSocketButtonFunction)(const struct bContext *C, struct uiBlock *block, 
-										 struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock,
-										 const char *name, int x, int y, int width);
+                                         struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock,
+                                         const char *name, int x, int y, int width);
 
 /** Defines a socket type.
  * Defines the appearance and behavior of a socket in the UI.
@@ -301,36 +301,36 @@ struct bNodeType *ntreeGetNodeType(struct bNodeTree *ntree);
 struct bNodeSocketType *ntreeGetSocketType(int type);
 
 struct bNodeTree *ntreeAddTree(const char *name, int type, int nodetype);
-void			ntreeInitTypes(struct bNodeTree *ntree);
+void            ntreeInitTypes(struct bNodeTree *ntree);
 
-void			ntreeFreeTree(struct bNodeTree *ntree);
+void            ntreeFreeTree(struct bNodeTree *ntree);
 struct bNodeTree *ntreeCopyTree(struct bNodeTree *ntree);
-void			ntreeSwitchID(struct bNodeTree *ntree, struct ID *sce_from, struct ID *sce_to);
-void			ntreeMakeLocal(struct bNodeTree *ntree);
-int				ntreeHasType(struct bNodeTree *ntree, int type);
+void            ntreeSwitchID(struct bNodeTree *ntree, struct ID *sce_from, struct ID *sce_to);
+void            ntreeMakeLocal(struct bNodeTree *ntree);
+int             ntreeHasType(struct bNodeTree *ntree, int type);
 
-void			ntreeUpdateTree(struct bNodeTree *ntree);
+void            ntreeUpdateTree(struct bNodeTree *ntree);
 /* XXX Currently each tree update call does call to ntreeVerifyNodes too.
  * Some day this should be replaced by a decent depsgraph automatism!
  */
-void			ntreeVerifyNodes(struct Main *main, struct ID *id);
+void            ntreeVerifyNodes(struct Main *main, struct ID *id);
 
-void			ntreeGetDependencyList(struct bNodeTree *ntree, struct bNode ***deplist, int *totnodes);
+void            ntreeGetDependencyList(struct bNodeTree *ntree, struct bNode ***deplist, int *totnodes);
 
 /* XXX old trees handle output flags automatically based on special output node types and last active selection.
  * new tree types have a per-output socket flag to indicate the final output to use explicitly.
  */
-void			ntreeSetOutput(struct bNodeTree *ntree);
-void			ntreeInitPreview(struct bNodeTree *, int xsize, int ysize);
-void			ntreeClearPreview(struct bNodeTree *ntree);
+void            ntreeSetOutput(struct bNodeTree *ntree);
+void            ntreeInitPreview(struct bNodeTree *, int xsize, int ysize);
+void            ntreeClearPreview(struct bNodeTree *ntree);
 
-void			ntreeFreeCache(struct bNodeTree *ntree);
+void            ntreeFreeCache(struct bNodeTree *ntree);
 
-int				ntreeNodeExists(struct bNodeTree *ntree, struct bNode *testnode);
-int				ntreeOutputExists(struct bNode *node, struct bNodeSocket *testsock);
+int             ntreeNodeExists(struct bNodeTree *ntree, struct bNode *testnode);
+int             ntreeOutputExists(struct bNode *node, struct bNodeSocket *testsock);
 struct bNodeTree *ntreeLocalize(struct bNodeTree *ntree);
-void			ntreeLocalSync(struct bNodeTree *localtree, struct bNodeTree *ntree);
-void			ntreeLocalMerge(struct bNodeTree *localtree, struct bNodeTree *ntree);
+void            ntreeLocalSync(struct bNodeTree *localtree, struct bNodeTree *ntree);
+void            ntreeLocalMerge(struct bNodeTree *localtree, struct bNodeTree *ntree);
 
 /* ************** GENERIC API, NODES *************** */
 
@@ -339,98 +339,98 @@ struct bNodeSocket *nodeInsertSocket(struct bNodeTree *ntree, struct bNode *node
 void nodeRemoveSocket(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock);
 void nodeRemoveAllSockets(struct bNodeTree *ntree, struct bNode *node);
 
-void			nodeAddToPreview(struct bNode *node, float col[4], int x, int y, int do_manage);
+void            nodeAddToPreview(struct bNode *node, float col[4], int x, int y, int do_manage);
 
 struct bNode	*nodeAddNode(struct bNodeTree *ntree, struct bNodeTemplate *ntemp);
-void			nodeUnlinkNode(struct bNodeTree *ntree, struct bNode *node);
-void			nodeUniqueName(struct bNodeTree *ntree, struct bNode *node);
+void            nodeUnlinkNode(struct bNodeTree *ntree, struct bNode *node);
+void            nodeUniqueName(struct bNodeTree *ntree, struct bNode *node);
 
-void			nodeRegisterType(struct bNodeTreeType *ttype, struct bNodeType *ntype);
-void			nodeMakeDynamicType(struct bNode *node);
-int				nodeDynamicUnlinkText(struct ID *txtid);
+void            nodeRegisterType(struct bNodeTreeType *ttype, struct bNodeType *ntype);
+void            nodeMakeDynamicType(struct bNode *node);
+int             nodeDynamicUnlinkText(struct ID *txtid);
 
-void			nodeFreeNode(struct bNodeTree *ntree, struct bNode *node);
+void            nodeFreeNode(struct bNodeTree *ntree, struct bNode *node);
 struct bNode	*nodeCopyNode(struct bNodeTree *ntree, struct bNode *node);
 
 struct bNodeLink *nodeAddLink(struct bNodeTree *ntree, struct bNode *fromnode, struct bNodeSocket *fromsock, struct bNode *tonode, struct bNodeSocket *tosock);
-void			nodeRemLink(struct bNodeTree *ntree, struct bNodeLink *link);
-void			nodeRemSocketLinks(struct bNodeTree *ntree, struct bNodeSocket *sock);
-void			nodeInternalRelink(struct bNodeTree *ntree, struct bNode *node);
+void            nodeRemLink(struct bNodeTree *ntree, struct bNodeLink *link);
+void            nodeRemSocketLinks(struct bNodeTree *ntree, struct bNodeSocket *sock);
+void            nodeInternalRelink(struct bNodeTree *ntree, struct bNode *node);
 
-void			nodeToView(struct bNode *node, float x, float y, float *rx, float *ry);
-void			nodeFromView(struct bNode *node, float x, float y, float *rx, float *ry);
-void			nodeAttachNode(struct bNode *node, struct bNode *parent);
-void			nodeDetachNode(struct bNode *node);
+void            nodeToView(struct bNode *node, float x, float y, float *rx, float *ry);
+void            nodeFromView(struct bNode *node, float x, float y, float *rx, float *ry);
+void            nodeAttachNode(struct bNode *node, struct bNode *parent);
+void            nodeDetachNode(struct bNode *node);
 
-struct bNode	*nodeFindNodebyName(struct bNodeTree *ntree, const char *name);
-int				nodeFindNode(struct bNodeTree *ntree, struct bNodeSocket *sock, struct bNode **nodep, int *sockindex, int *in_out);
+struct bNode   *nodeFindNodebyName(struct bNodeTree *ntree, const char *name);
+int             nodeFindNode(struct bNodeTree *ntree, struct bNodeSocket *sock, struct bNode **nodep, int *sockindex, int *in_out);
 
 struct bNodeLink *nodeFindLink(struct bNodeTree *ntree, struct bNodeSocket *from, struct bNodeSocket *to);
-int				nodeCountSocketLinks(struct bNodeTree *ntree, struct bNodeSocket *sock);
+int             nodeCountSocketLinks(struct bNodeTree *ntree, struct bNodeSocket *sock);
 
-void			nodeSetActive(struct bNodeTree *ntree, struct bNode *node);
-struct bNode	*nodeGetActive(struct bNodeTree *ntree);
-struct bNode	*nodeGetActiveID(struct bNodeTree *ntree, short idtype);
-int				nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
-void			nodeClearActive(struct bNodeTree *ntree);
-void			nodeClearActiveID(struct bNodeTree *ntree, short idtype);
-struct bNode	*nodeGetActiveTexture(struct bNodeTree *ntree);
+void            nodeSetActive(struct bNodeTree *ntree, struct bNode *node);
+struct bNode   *nodeGetActive(struct bNodeTree *ntree);
+struct bNode   *nodeGetActiveID(struct bNodeTree *ntree, short idtype);
+int             nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
+void            nodeClearActive(struct bNodeTree *ntree);
+void            nodeClearActiveID(struct bNodeTree *ntree, short idtype);
+struct bNode   *nodeGetActiveTexture(struct bNodeTree *ntree);
 
-void			nodeUpdate(struct bNodeTree *ntree, struct bNode *node);
-int				nodeUpdateID(struct bNodeTree *ntree, struct ID *id);
+void            nodeUpdate(struct bNodeTree *ntree, struct bNode *node);
+int             nodeUpdateID(struct bNodeTree *ntree, struct ID *id);
 
-void			nodeFreePreview(struct bNode *node);
+void            nodeFreePreview(struct bNode *node);
 
-int				nodeSocketIsHidden(struct bNodeSocket *sock);
-void			nodeSocketSetType(struct bNodeSocket *sock, int type);
+int             nodeSocketIsHidden(struct bNodeSocket *sock);
+void            nodeSocketSetType(struct bNodeSocket *sock, int type);
 
 /* ************** NODE TYPE ACCESS *************** */
 
 struct bNodeTemplate nodeMakeTemplate(struct bNode *node);
-int				nodeValid(struct bNodeTree *ntree, struct bNodeTemplate *ntemp);
-const char*		nodeLabel(struct bNode *node);
+int             nodeValid(struct bNodeTree *ntree, struct bNodeTemplate *ntemp);
+const char     *nodeLabel(struct bNode *node);
 struct bNodeTree *nodeGroupEditGet(struct bNode *node);
 struct bNodeTree *nodeGroupEditSet(struct bNode *node, int edit);
-void			nodeGroupEditClear(struct bNode *node);
+void            nodeGroupEditClear(struct bNode *node);
 
 /* Init a new node type struct with default values and callbacks */
-void			node_type_base(struct bNodeTreeType *ttype, struct bNodeType *ntype, int type,
+void            node_type_base(struct bNodeTreeType *ttype, struct bNodeType *ntype, int type,
                                const char *name, short nclass, short flag);
-void			node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTemplate *inputs, struct bNodeSocketTemplate *outputs);
-void			node_type_size(struct bNodeType *ntype, int width, int minwidth, int maxwidth);
-void			node_type_init(struct bNodeType *ntype, void (*initfunc)(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp));
-void			node_type_valid(struct bNodeType *ntype, int (*validfunc)(struct bNodeTree *ntree, struct bNodeTemplate *ntemp));
-void			node_type_storage(struct bNodeType *ntype,
-								  const char *storagename,
-								  void (*freestoragefunc)(struct bNode *),
-								  void (*copystoragefunc)(struct bNode *, struct bNode *));
-void			node_type_label(struct bNodeType *ntype, const char *(*labelfunc)(struct bNode *));
-void			node_type_template(struct bNodeType *ntype, struct bNodeTemplate (*templatefunc)(struct bNode *));
-void			node_type_update(struct bNodeType *ntype,
-								 void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node),
-								 void (*verifyfunc)(struct bNodeTree *ntree, struct bNode *node, struct ID *id));
-void			node_type_tree(struct bNodeType *ntype,
-							   void (*inittreefunc)(struct bNodeTree *),
-							   void (*updatetreefunc)(struct bNodeTree *));
-void			node_type_group_edit(struct bNodeType *ntype,
-									 struct bNodeTree *(*group_edit_get)(struct bNode *node),
-									 struct bNodeTree *(*group_edit_set)(struct bNode *node, int edit),
-									 void (*group_edit_clear)(struct bNode *node));
-
-void			node_type_exec(struct bNodeType *ntype, void (*execfunc)(void *data, struct bNode *, struct bNodeStack **,
+void            node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTemplate *inputs, struct bNodeSocketTemplate *outputs);
+void            node_type_size(struct bNodeType *ntype, int width, int minwidth, int maxwidth);
+void            node_type_init(struct bNodeType *ntype, void (*initfunc)(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp));
+void            node_type_valid(struct bNodeType *ntype, int (*validfunc)(struct bNodeTree *ntree, struct bNodeTemplate *ntemp));
+void            node_type_storage(struct bNodeType *ntype,
+                                  const char *storagename,
+                                  void (*freestoragefunc)(struct bNode *),
+                                  void (*copystoragefunc)(struct bNode *, struct bNode *));
+void            node_type_label(struct bNodeType *ntype, const char *(*labelfunc)(struct bNode *));
+void            node_type_template(struct bNodeType *ntype, struct bNodeTemplate (*templatefunc)(struct bNode *));
+void            node_type_update(struct bNodeType *ntype,
+                                 void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node),
+                                 void (*verifyfunc)(struct bNodeTree *ntree, struct bNode *node, struct ID *id));
+void            node_type_tree(struct bNodeType *ntype,
+                               void (*inittreefunc)(struct bNodeTree *),
+                               void (*updatetreefunc)(struct bNodeTree *));
+void            node_type_group_edit(struct bNodeType *ntype,
+                                     struct bNodeTree *(*group_edit_get)(struct bNode *node),
+                                     struct bNodeTree *(*group_edit_set)(struct bNode *node, int edit),
+                                     void (*group_edit_clear)(struct bNode *node));
+
+void            node_type_exec(struct bNodeType *ntype, void (*execfunc)(void *data, struct bNode *, struct bNodeStack **,
                                                                          struct bNodeStack **));
-void			node_type_exec_new(struct bNodeType *ntype,
-								   void *(*initexecfunc)(struct bNode *node),
-								   void (*freeexecfunc)(struct bNode *node, void *nodedata),
-								   void (*newexecfunc)(void *data, int thread, struct bNode *, void *nodedata,
-								                       struct bNodeStack **, struct bNodeStack **));
-void			node_type_internal_connect(struct bNodeType *ntype, ListBase (*internal_connect)(struct bNodeTree *, struct bNode *));
-void			node_type_gpu(struct bNodeType *ntype, int (*gpufunc)(struct GPUMaterial *mat, struct bNode *node,
+void            node_type_exec_new(struct bNodeType *ntype,
+                                   void *(*initexecfunc)(struct bNode *node),
+                                   void (*freeexecfunc)(struct bNode *node, void *nodedata),
+                                   void (*newexecfunc)(void *data, int thread, struct bNode *, void *nodedata,
+                                                       struct bNodeStack **, struct bNodeStack **));
+void            node_type_internal_connect(struct bNodeType *ntype, ListBase (*internal_connect)(struct bNodeTree *, struct bNode *));
+void            node_type_gpu(struct bNodeType *ntype, int (*gpufunc)(struct GPUMaterial *mat, struct bNode *node,
                                                                       struct GPUNodeStack *in, struct GPUNodeStack *out));
-void			node_type_gpu_ext(struct bNodeType *ntype, int (*gpuextfunc)(struct GPUMaterial *mat, struct bNode *node,
+void            node_type_gpu_ext(struct bNodeType *ntype, int (*gpuextfunc)(struct GPUMaterial *mat, struct bNode *node,
                                                                              void *nodedata, struct GPUNodeStack *in,
                                                                              struct GPUNodeStack *out));
-void			node_type_compatibility(struct bNodeType *ntype, short compatibility);
+void            node_type_compatibility(struct bNodeType *ntype, short compatibility);
 
 /* ************** COMMON NODES *************** */
 
@@ -545,16 +545,16 @@ struct ShadeResult;
 /* API */
 
 struct bNodeTreeExec *ntreeShaderBeginExecTree(struct bNodeTree *ntree, int use_tree_data);
-void			ntreeShaderEndExecTree(struct bNodeTreeExec *exec, int use_tree_data);
-void			ntreeShaderExecTree(struct bNodeTree *ntree, struct ShadeInput *shi, struct ShadeResult *shr);
-void			ntreeShaderGetTexcoMode(struct bNodeTree *ntree, int osa, short *texco, int *mode);
-void			nodeShaderSynchronizeID(struct bNode *node, int copyto);
+void            ntreeShaderEndExecTree(struct bNodeTreeExec *exec, int use_tree_data);
+void            ntreeShaderExecTree(struct bNodeTree *ntree, struct ShadeInput *shi, struct ShadeResult *shr);
+void            ntreeShaderGetTexcoMode(struct bNodeTree *ntree, int osa, short *texco, int *mode);
+void            nodeShaderSynchronizeID(struct bNode *node, int copyto);
 
-				/* switch material render loop */
+/* switch material render loop */
 extern void (*node_shader_lamp_loop)(struct ShadeInput *, struct ShadeResult *);
-void			set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, struct ShadeResult *));
+void            set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, struct ShadeResult *));
 
-void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
+void            ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
 
 
 /* ************** COMPOSITE NODES *************** */
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 09fb88fd5ac..d876d311d30 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -179,8 +179,8 @@ int ED_object_modifier_apply(struct ReportList *reports, struct Scene *scene,
 int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
 
 int ED_object_iter_other(struct Main *bmain, struct Object *orig_ob, int include_orig,
-						 int (*callback)(struct Object *ob, void *callback_data),
-						 void *callback_data);
+                         int (*callback)(struct Object *ob, void *callback_data),
+                         void *callback_data);
 
 int ED_object_multires_update_totlevels_cb(struct Object *ob, void *totlevel_v);
 
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 25361bc8de9..70f2bf7b028 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2649,7 +2649,7 @@ void uiPupMenuOkee(bContext *C, const char *opname, const char *str, ...)
  * The operator state for this is implicitly OPERATOR_RUNNING_MODAL */
 void uiPupMenuSaveOver(bContext *C, wmOperator *op, const char *filename)
 {
-	confirm_operator(C, op, "Save Over", filename);
+	confirm_operator(C, op, "Save Over?", filename);
 }
 
 void uiPupMenuNotice(bContext *C, const char *str, ...)
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 5011c785e90..60efc3b3541 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -310,15 +310,15 @@ int			WM_jobs_test(struct wmWindowManager *wm, void *owner);
 float		WM_jobs_progress(struct wmWindowManager *wm, void *owner);
 char		*WM_jobs_name(struct wmWindowManager *wm, void *owner);
 
-int             WM_jobs_is_running(struct wmJob *);
-void*           WM_jobs_get_customdata(struct wmJob *);
-void		WM_jobs_customdata(struct wmJob *, void *customdata, void (*free)(void *));
-void		WM_jobs_timer(struct wmJob *, double timestep, unsigned int note, unsigned int endnote);
-void		WM_jobs_callbacks(struct wmJob *, 
-							  void (*startjob)(void *, short *, short *, float *),
-							  void (*initjob)(void *),
-							  void (*update)(void *),
-							  void (*endjob)(void *));
+int         WM_jobs_is_running(struct wmJob *);
+void *      WM_jobs_get_customdata(struct wmJob *);
+void        WM_jobs_customdata(struct wmJob *, void *customdata, void (*free)(void *));
+void        WM_jobs_timer(struct wmJob *, double timestep, unsigned int note, unsigned int endnote);
+void        WM_jobs_callbacks(struct wmJob *,
+                              void (*startjob)(void *, short *, short *, float *),
+                              void (*initjob)(void *),
+                              void (*update)(void *),
+                              void (*endjob)(void *));
 
 void		WM_jobs_start(struct wmWindowManager *wm, struct wmJob *);
 void		WM_jobs_stop(struct wmWindowManager *wm, void *owner, void *startjob);
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 7e3378bd13f..f8480753395 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -309,8 +309,8 @@ public:
 	RAS_BucketManager* GetBucketManager();
 	RAS_MaterialBucket*	FindBucket(RAS_IPolyMaterial* polymat, bool &bucketCreated);
 	void RenderBuckets(const MT_Transform& cameratransform,
-						RAS_IRasterizer* rasty,
-						RAS_IRenderTools* rendertools);
+	                   RAS_IRasterizer* rasty,
+	                   RAS_IRenderTools* rendertools);
 
 	/**
 	 * Update all transforms according to the scenegraph.
@@ -325,18 +325,18 @@ public:
 				m_groupGameObjects.find(gameobj) != m_groupGameObjects.end());
 	}
 	SCA_IObject* AddReplicaObject(CValue* gameobj,
-								  CValue* locationobj,
-								  int lifespan=0);
+	                              CValue* locationobj,
+	                              int lifespan=0);
 	KX_GameObject* AddNodeReplicaObject(SG_IObject* node,
-										CValue* gameobj);
+	                                    CValue* gameobj);
 	void RemoveNodeDestructObject(SG_IObject* node,
-								  CValue* gameobj);
+	                              CValue* gameobj);
 	void RemoveObject(CValue* gameobj);
 	void DelayedRemoveObject(CValue* gameobj);
 	
 	int NewRemoveObject(CValue* gameobj);
 	void ReplaceMesh(CValue* gameobj,
-					 void* meshob, bool use_gfx, bool use_phys);
+	                 void* meshob, bool use_gfx, bool use_phys);
 
 	void AddAnimatedObject(CValue* gameobj);
 	void RemoveAnimatedObject(CValue* gameobj);
diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h
index a72929d25c5..69bbc7745e0 100644
--- a/source/gameengine/Physics/common/PHY_DynamicTypes.h
+++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h
@@ -96,18 +96,18 @@ enum
 	PHY_NUM_RESPONSE
 };
 
-	typedef struct PHY_CollData {
-		PHY__Vector3 m_point1;               /* Point in object1 in world coordinates */ 
-		PHY__Vector3 m_point2;               /* Point in object2 in world coordinates */
-		PHY__Vector3 m_normal;               /* point2 - point1 */ 
-	} PHY_CollData;
-
-
-	typedef bool (*PHY_ResponseCallback)(void *client_data,
-										   void *client_object1,
-										   void *client_object2,
-										   const PHY_CollData *coll_data);
-	typedef void (*PHY_CullingCallback)(KX_ClientObjectInfo* info, void* param);
+typedef struct PHY_CollData {
+	PHY__Vector3 m_point1;               /* Point in object1 in world coordinates */
+	PHY__Vector3 m_point2;               /* Point in object2 in world coordinates */
+	PHY__Vector3 m_normal;               /* point2 - point1 */
+} PHY_CollData;
+
+
+typedef bool (*PHY_ResponseCallback)(void *client_data,
+                                     void *client_object1,
+                                     void *client_object2,
+                                     const PHY_CollData *coll_data);
+typedef void (*PHY_CullingCallback)(KX_ClientObjectInfo* info, void* param);
 
 
 /// PHY_PhysicsType enumerates all possible Physics Entities.
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index 5d3efb8c38a..c02bc5e7a44 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -113,14 +113,14 @@ public:
 	 */
 	virtual 
 		void	
-	RenderText3D(int fontid,
-				 const char* text,
-				 int size,
-				 int dpi,
-				 float* color,
-				 double* mat,
-				 float aspect
-	) = 0;
+		RenderText3D(int fontid,
+		             const char* text,
+		             int size,
+		             int dpi,
+		             float* color,
+		             double* mat,
+		             float aspect
+		             ) = 0;
 
 
 	/**