[Bf-blender-cvs] [81c33f0ba79] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Mon Jun 1 07:05:51 CEST 2020


Commit: 81c33f0ba7952555714245ba6cfecf6d9f85839a
Author: Campbell Barton
Date:   Mon Jun 1 15:04:30 2020 +1000
Branches: master
https://developer.blender.org/rB81c33f0ba7952555714245ba6cfecf6d9f85839a

Cleanup: clang-format

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

M	build_files/build_environment/cmake/openimageio.cmake
M	source/blender/blenkernel/intern/seqprefetch.c
M	source/blender/editors/transform/transform_orientations.c
M	source/blender/windowmanager/intern/wm_cursors.c

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

diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake
index 63489993fa7..6ff238468fb 100644
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -155,4 +155,3 @@ if(WIN32)
     )
   endif()
 endif()
-
diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c
index dc75e2b9098..30a371b5b28 100644
--- a/source/blender/blenkernel/intern/seqprefetch.c
+++ b/source/blender/blenkernel/intern/seqprefetch.c
@@ -435,11 +435,8 @@ static void *seq_prefetch_frames(void *job)
 
     seq_prefetch_update_depsgraph(pfjob);
     AnimData *adt = BKE_animdata_from_id(&pfjob->context_cpy.scene->id);
-    BKE_animsys_evaluate_animdata(&pfjob->context_cpy.scene->id,
-                                  adt,
-                                  seq_prefetch_cfra(pfjob),
-                                  ADT_RECALC_ALL,
-                                  false);
+    BKE_animsys_evaluate_animdata(
+        &pfjob->context_cpy.scene->id, adt, seq_prefetch_cfra(pfjob), ADT_RECALC_ALL, false);
 
     /* This is quite hacky solution:
      * We need cross-reference original scene with copy for cache.
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 70060b5812b..18ea73a01be 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -562,16 +562,17 @@ short transform_orientation_matrix_get(bContext *C,
       orientation_index_custom = orientation - V3D_ORIENT_CUSTOM;
     }
 
-    return ED_transform_calc_orientation_from_type_ex(C,
-                                                      r_spacemtx,
-                                                      /* extra args (can be accessed from context) */
-                                                      t->scene,
-                                                      rv3d,
-                                                      ob,
-                                                      obedit,
-                                                      orientation,
-                                                      orientation_index_custom,
-                                                      t->around);
+    return ED_transform_calc_orientation_from_type_ex(
+        C,
+        r_spacemtx,
+        /* extra args (can be accessed from context) */
+        t->scene,
+        rv3d,
+        ob,
+        obedit,
+        orientation,
+        orientation_index_custom,
+        t->around);
   }
 
   unit_m3(r_spacemtx);
diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index 07d7ccf31db..2af68956923 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -150,7 +150,7 @@ void WM_cursor_set(wmWindow *win, int curs)
   }
 
   if (win->cursor == curs) {
-      return; /* Cursor is already set */
+    return; /* Cursor is already set */
   }
 
   win->cursor = curs;



More information about the Bf-blender-cvs mailing list