[Bf-blender-cvs] [4eac03d821f] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Mon Nov 16 07:05:46 CET 2020


Commit: 4eac03d821fa17546f562485f7d073813a5e5943
Author: Campbell Barton
Date:   Mon Nov 16 16:48:19 2020 +1100
Branches: master
https://developer.blender.org/rB4eac03d821fa17546f562485f7d073813a5e5943

Cleanup: clang-format

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

M	source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/include/ED_image.h
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index eb70760e556..3c55d832568 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@ -118,8 +118,10 @@ void DepsgraphNodeBuilder::build_splineik_pose(Object *object,
   /* Find the chain's root. */
   bPoseChannel *rootchan = BKE_armature_splineik_solver_find_root(pchan, data);
 
-  if (has_operation_node(
-          &object->id, NodeType::EVAL_POSE, rootchan->name, OperationCode::POSE_SPLINE_IK_SOLVER)) {
+  if (has_operation_node(&object->id,
+                         NodeType::EVAL_POSE,
+                         rootchan->name,
+                         OperationCode::POSE_SPLINE_IK_SOLVER)) {
     return;
   }
 
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index a1c2ff12866..19aa3b69bbb 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -2647,7 +2647,7 @@ void ED_gpencil_select_curve_toggle_all(bContext *C, int action)
     GP_EDITABLE_CURVES_END(gps_iter);
   }
   else {
-    GP_EDITABLE_STROKES_BEGIN(gps_iter, C, gpl, gps){
+    GP_EDITABLE_STROKES_BEGIN (gps_iter, C, gpl, gps) {
       Object *ob = CTX_data_active_object(C);
       bGPdata *gpd = ob->data;
       bool selected = false;
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index 4835d2118d9..c1d3a17b9b6 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -55,11 +55,8 @@ void ED_space_image_auto_set(const struct bContext *C, struct SpaceImage *sima);
 struct Mask *ED_space_image_get_mask(struct SpaceImage *sima);
 void ED_space_image_set_mask(struct bContext *C, struct SpaceImage *sima, struct Mask *mask);
 
-bool ED_space_image_color_sample(struct SpaceImage *sima,
-                                 struct ARegion *region,
-                                 int mval[2],
-                                 float r_col[3],
-                                 bool *r_is_data);
+bool ED_space_image_color_sample(
+    struct SpaceImage *sima, struct ARegion *region, int mval[2], float r_col[3], bool *r_is_data);
 struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock, int tile);
 int ED_space_image_get_display_channel_mask(struct ImBuf *ibuf);
 void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 13dcdf62db2..dd7cb2bf643 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -5605,7 +5605,11 @@ static void rna_def_fileselect_idfilter(BlenderRNA *brna)
        ICON_GREASEPENCIL,
        "Grease Pencil",
        "Show Grease pencil data-blocks"},
-      {FILTER_ID_GR, "filter_group", ICON_OUTLINER_COLLECTION, "Collections", "Show Collection data-blocks"},
+      {FILTER_ID_GR,
+       "filter_group",
+       ICON_OUTLINER_COLLECTION,
+       "Collections",
+       "Show Collection data-blocks"},
       {FILTER_ID_HA, "filter_hair", ICON_HAIR_DATA, "Hairs", "Show/hide Hair data-blocks"},
       {FILTER_ID_IM, "filter_image", ICON_IMAGE_DATA, "Images", "Show Image data-blocks"},
       {FILTER_ID_LA, "filter_light", ICON_LIGHT_DATA, "Lights", "Show Light data-blocks"},



More information about the Bf-blender-cvs mailing list