code cleanup: header cleanup and remove some duplicate defines.

1 files changed, 57 insertions, 57 deletions

diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h
index b7edf04724d..cf7e4b24288 100644
--- a/source/blender/blenkernel/BKE_depsgraph.h
+++ b/source/blender/blenkernel/BKE_depsgraph.h
@@ -46,37 +46,37 @@ struct GHash;
 
 /* **** DAG relation types *** */
 
-	/* scene link to object */
-#define DAG_RL_SCENE		(1<<0)
-	/* object link to data */
-#define DAG_RL_DATA			(1<<1)
+/* scene link to object */
+#define DAG_RL_SCENE        (1 << 0)
+/* object link to data */
+#define DAG_RL_DATA         (1 << 1)
 
-	/* object changes object (parent, track, constraints) */
-#define DAG_RL_OB_OB		(1<<2)
-	/* object changes obdata (hooks, constraints) */
-#define DAG_RL_OB_DATA		(1<<3)
-	/* data changes object (vertex parent) */
-#define DAG_RL_DATA_OB		(1<<4)
-	/* data changes data (deformers) */
-#define DAG_RL_DATA_DATA	(1<<5)
+/* object changes object (parent, track, constraints) */
+#define DAG_RL_OB_OB        (1 << 2)
+/* object changes obdata (hooks, constraints) */
+#define DAG_RL_OB_DATA      (1 << 3)
+/* data changes object (vertex parent) */
+#define DAG_RL_DATA_OB      (1 << 4)
+/* data changes data (deformers) */
+#define DAG_RL_DATA_DATA    (1 << 5)
 
-#define DAG_NO_RELATION		(1<<6)
+#define DAG_NO_RELATION     (1 << 6)
 
-#define DAG_RL_ALL_BUT_DATA (DAG_RL_SCENE|DAG_RL_OB_OB|DAG_RL_OB_DATA|DAG_RL_DATA_OB|DAG_RL_DATA_DATA)
-#define DAG_RL_ALL			(DAG_RL_ALL_BUT_DATA|DAG_RL_DATA)
+#define DAG_RL_ALL_BUT_DATA (DAG_RL_SCENE | DAG_RL_OB_OB | DAG_RL_OB_DATA | DAG_RL_DATA_OB | DAG_RL_DATA_DATA)
+#define DAG_RL_ALL          (DAG_RL_ALL_BUT_DATA | DAG_RL_DATA)
 
 
-typedef void (*graph_action_func)(void * ob, void **data);
+typedef void (*graph_action_func)(void *ob, void **data);
 
 // queues are returned by all BFS & DFS queries
 // opaque type
-void	*pop_ob_queue(struct DagNodeQueue *queue);
-int		queue_count(struct DagNodeQueue *queue);
-void	queue_delete(struct DagNodeQueue *queue);
+void    *pop_ob_queue(struct DagNodeQueue *queue);
+int     queue_count(struct DagNodeQueue *queue);
+void    queue_delete(struct DagNodeQueue *queue);
 
 // queries
-struct DagForest	*build_dag(struct Main *bmain, struct Scene *sce, short mask);
-void				free_forest(struct DagForest *Dag);
+struct DagForest    *build_dag(struct Main *bmain, struct Scene *sce, short mask);
+void                free_forest(struct DagForest *Dag);
 
 // note :
 // the meanings of the 2 returning values is a bit different :
@@ -88,49 +88,49 @@ int pre_and_post_DFS(struct DagForest *dag, short mask, graph_action_func pre_fu
 int pre_and_post_source_BFS(struct DagForest *dag, short mask, struct DagNode *source, graph_action_func pre_func, graph_action_func post_func, void **data);
 int pre_and_post_source_DFS(struct DagForest *dag, short mask, struct DagNode *source, graph_action_func pre_func, graph_action_func post_func, void **data);
 
-struct DagNodeQueue *get_obparents(struct DagForest	*dag, void *ob); 
-struct DagNodeQueue *get_first_ancestors(struct DagForest	*dag, void *ob); 
-struct DagNodeQueue *get_all_childs(struct DagForest	*dag, void *ob); //
-short		are_obs_related(struct DagForest	*dag, void *ob1, void *ob2);
-int					is_acyclic(struct DagForest	*dag); //
+struct DagNodeQueue *get_obparents(struct DagForest *dag, void *ob);
+struct DagNodeQueue *get_first_ancestors(struct DagForest   *dag, void *ob);
+struct DagNodeQueue *get_all_childs(struct DagForest    *dag, void *ob);
+short  are_obs_related(struct DagForest    *dag, void *ob1, void *ob2);
+int    is_acyclic(struct DagForest *dag);
 //int					get_cycles(struct DagForest	*dag, struct DagNodeQueue **queues, int *count); //
 
 /* ********** API *************** */
 /* Note that the DAG never executes changes in Objects, only sets flags in Objects */
 
-		/* (re)-create dependency graph for scene */
-void	DAG_scene_sort(struct Main *bmain, struct Scene *sce);
-
-		/* flag all objects that need recalc because they're animated */
-void	DAG_scene_update_flags(struct Main *bmain, struct Scene *sce, unsigned int lay, const short do_time);
-		/* flushes all recalc flags in objects down the dependency tree */
-void	DAG_scene_flush_update(struct Main *bmain, struct Scene *sce, unsigned int lay, const short do_time);
-		/* tag objects for update on file load */
-void	DAG_on_visible_update(struct Main *bmain, const short do_time);
-
-		/* when setting manual RECALC flags, call this afterwards */
-void	DAG_ids_flush_update(struct Main *bmain, int time);
-
-		/* tag datablock to get updated for the next redraw */
-void	DAG_id_tag_update(struct ID *id, short flag);
-		/* flush all tagged updates */
-void	DAG_ids_flush_tagged(struct Main *bmain);
-		/* check and clear ID recalc flags */
-void	DAG_ids_check_recalc(struct Main *bmain, struct Scene *scene, int time);
-void	DAG_ids_clear_recalc(struct Main *bmain);
-		/* test if any of this id type is tagged for update */
-void	DAG_id_type_tag(struct Main *bmain, short idtype);
-int		DAG_id_type_tagged(struct Main *bmain, short idtype);
-
-		/* (re)-create dependency graph for armature pose */
-void	DAG_pose_sort(struct Object *ob);
-
-		/* callback for editors module to do updates */
-void	DAG_editors_update_cb(void (*id_func)(struct Main *bmain, struct ID *id),
+/* (re)-create dependency graph for scene */
+void    DAG_scene_sort(struct Main *bmain, struct Scene *sce);
+
+/* flag all objects that need recalc because they're animated */
+void    DAG_scene_update_flags(struct Main *bmain, struct Scene *sce, unsigned int lay, const short do_time);
+/* flushes all recalc flags in objects down the dependency tree */
+void    DAG_scene_flush_update(struct Main *bmain, struct Scene *sce, unsigned int lay, const short do_time);
+/* tag objects for update on file load */
+void    DAG_on_visible_update(struct Main *bmain, const short do_time);
+
+/* when setting manual RECALC flags, call this afterwards */
+void    DAG_ids_flush_update(struct Main *bmain, int time);
+
+/* tag datablock to get updated for the next redraw */
+void    DAG_id_tag_update(struct ID *id, short flag);
+/* flush all tagged updates */
+void    DAG_ids_flush_tagged(struct Main *bmain);
+/* check and clear ID recalc flags */
+void    DAG_ids_check_recalc(struct Main *bmain, struct Scene *scene, int time);
+void    DAG_ids_clear_recalc(struct Main *bmain);
+/* test if any of this id type is tagged for update */
+void    DAG_id_type_tag(struct Main *bmain, short idtype);
+int     DAG_id_type_tagged(struct Main *bmain, short idtype);
+
+/* (re)-create dependency graph for armature pose */
+void    DAG_pose_sort(struct Object *ob);
+
+/* callback for editors module to do updates */
+void    DAG_editors_update_cb(void (*id_func)(struct Main *bmain, struct ID *id),
                               void (*scene_func)(struct Main *bmain, struct Scene *scene, int updated));
 
-		/* debugging */
-void	DAG_print_dependencies(struct Main *bmain, struct Scene *scene, struct Object *ob);
+/* debugging */
+void    DAG_print_dependencies(struct Main *bmain, struct Scene *scene, struct Object *ob);
 
 #ifdef __cplusplus
 }