[Bf-blender-cvs] [2b634cc368d] temp-workspace-object-mode-removal: Cleanup: sync header indentation w/ 2.8

[Campbell Barton]

Commit: 2b634cc368d1a2e7972e758db5d35514ea5c0251
Author: Campbell Barton
Date:   Tue Feb 6 19:03:11 2018 +1100
Branches: temp-workspace-object-mode-removal
https://developer.blender.org/rB2b634cc368d1a2e7972e758db5d35514ea5c0251

Cleanup: sync header indentation w/ 2.8

===================================================================

M	source/blender/draw/intern/DRW_render.h
M	source/blender/editors/include/ED_mesh.h
M	source/blender/editors/include/ED_object.h

===================================================================

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 5876e9bc5f6..cad99d5e7ab 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -55,8 +55,6 @@
 
 #include "RE_engine.h"
 
-#include "DEG_depsgraph.h"
-
 struct bContext;
 struct GPUFrameBuffer;
 struct GPUShader;
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index af970dcc0ce..0293f7cd204 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -241,13 +241,11 @@ void                 ED_vgroup_data_clamp_range(struct ID *id, const int total);
 bool                 ED_vgroup_array_copy(struct Object *ob, struct Object *ob_from);
 bool                 ED_vgroup_parray_alloc(struct ID *id, struct MDeformVert ***dvert_arr, int *dvert_tot,
                                             const bool use_vert_sel);
-void                 ED_vgroup_parray_mirror_sync(
-        struct Object *ob,
-        struct MDeformVert **dvert_array, const int dvert_tot,
-        const bool *vgroup_validmap, const int vgroup_tot);
-void                 ED_vgroup_parray_mirror_assign(
-        struct Object *ob,
-        struct MDeformVert **dvert_array, const int dvert_tot);
+void                 ED_vgroup_parray_mirror_sync(struct Object *ob,
+                                                  struct MDeformVert **dvert_array, const int dvert_tot,
+                                                  const bool *vgroup_validmap, const int vgroup_tot);
+void                 ED_vgroup_parray_mirror_assign(struct Object *ob,
+                                                    struct MDeformVert **dvert_array, const int dvert_tot);
 void                 ED_vgroup_parray_remove_zero(struct MDeformVert **dvert_array, const int dvert_tot,
                                                   const bool *vgroup_validmap, const int vgroup_tot,
                                                   const float epsilon, const bool keep_single);
@@ -256,11 +254,10 @@ void                 ED_vgroup_parray_to_weight_array(const struct MDeformVert *
 void                 ED_vgroup_parray_from_weight_array(struct MDeformVert **dvert_array, const int dvert_tot,
                                                         const float *dvert_weights, const int def_nr,
                                                         const bool remove_zero);
-void ED_vgroup_mirror(
-        struct Object *ob,
-        const bool mirror_weights, const bool flip_vgroups,
-        const bool all_vgroups, const bool use_topology,
-        int *r_totmirr, int *r_totfail);
+void                 ED_vgroup_mirror(struct Object *ob,
+                                      const bool mirror_weights, const bool flip_vgroups,
+                                      const bool all_vgroups, const bool use_topology,
+                                      int *r_totmirr, int *r_totfail);
 
 void                 ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum,  float weight, int assignmode);
 void                 ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum);
@@ -319,31 +316,26 @@ int         join_mesh_shapes_exec(struct bContext *C, struct wmOperator *op);
 /* mirror lookup api */
 int ED_mesh_mirror_spatial_table(
         struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, const float co[3], char mode);
-int  ED_mesh_mirror_topo_table(
-        struct Object *ob, struct DerivedMesh *dm, char mode);
+int  ED_mesh_mirror_topo_table(struct Object *ob, struct DerivedMesh *dm, char mode);
 
 /* retrieves mirrored cache vert, or NULL if there isn't one.
  * note: calling this without ensuring the mirror cache state
  * is bad.*/
-int mesh_get_x_mirror_vert(
-        struct Object *ob, struct DerivedMesh *dm, int index, const bool use_topology);
-struct BMVert *editbmesh_get_x_mirror_vert(
-        struct Object *ob, struct BMEditMesh *em,
-        struct BMVert *eve, const float co[3],
-        int index, const bool use_topology);
-int *mesh_get_x_mirror_faces(
-        struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm);
-
-int ED_mesh_mirror_get_vert(
-        struct Object *ob, int index);
+int            mesh_get_x_mirror_vert(struct Object *ob, struct DerivedMesh *dm, int index, const bool use_topology);
+struct BMVert *editbmesh_get_x_mirror_vert(struct Object *ob, struct BMEditMesh *em,
+                                           struct BMVert *eve, const float co[3],
+                                           int index, const bool use_topology);
+int           *mesh_get_x_mirror_faces(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm);
+
+int ED_mesh_mirror_get_vert(struct Object *ob, int index);
 
 bool ED_mesh_pick_vert(struct bContext *C,      struct Object *ob, const int mval[2], unsigned int *index, int size, bool use_zbuf);
 bool ED_mesh_pick_face(struct bContext *C,      struct Object *ob, const int mval[2], unsigned int *index, int size);
 bool ED_mesh_pick_face_vert(struct bContext *C, struct Object *ob, const int mval[2], unsigned int *index, int size);
 
 
-struct MDeformVert *ED_mesh_active_dvert_get_ob(struct Object *ob, int *r_index);
 struct MDeformVert *ED_mesh_active_dvert_get_em(struct Object *ob, struct BMVert **r_eve);
+struct MDeformVert *ED_mesh_active_dvert_get_ob(struct Object *ob, int *r_index);
 struct MDeformVert *ED_mesh_active_dvert_get_only(struct Object *ob);
 
 #define ED_MESH_PICK_DEFAULT_VERT_SIZE 50
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index f3dbce1693e..ae06d21a350 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -111,9 +111,7 @@ void ED_object_base_activate(struct bContext *C, struct Base *base);
 void ED_object_base_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Object *ob);
 
 /* single object duplicate, if (dupflag == 0), fully linked, else it uses the flags given */
-struct Base *ED_object_add_duplicate(
-        struct Main *bmain, struct Scene *scene,
-        struct ViewLayer *view_layer, struct Base *base, int dupflag);
+struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, struct Base *base, int dupflag);
 
 void ED_object_parent(struct Object *ob, struct Object *parent, const int type, const char *substr);
 
@@ -213,7 +211,8 @@ bool ED_object_iter_other(
         void *callback_data);
 
 bool ED_object_multires_update_totlevels_cb(
-        const struct EvaluationContext *eval_ctx, struct Object *ob, void *totlevel_v);
+        const struct EvaluationContext *eval_ctx,
+        struct Object *ob, void *totlevel_v);
 
 /* object_select.c */
 void ED_object_select_linked_by_id(struct bContext *C, struct ID *id);