[Bf-blender-cvs] [1660eff1a22] master: Cleanup: format

Campbell Barton noreply at git.blender.org
Tue May 17 02:54:41 CEST 2022


Commit: 1660eff1a221974b64191d4626fcaff098b4aef2
Author: Campbell Barton
Date:   Tue May 17 10:06:13 2022 +1000
Branches: master
https://developer.blender.org/rB1660eff1a221974b64191d4626fcaff098b4aef2

Cleanup: format

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

M	intern/cycles/kernel/integrator/mnee.h
M	release/scripts/startup/bl_ui/space_sequencer.py
M	source/blender/bmesh/intern/bmesh_log.c
M	source/blender/draw/intern/draw_manager_data.c
M	tests/python/bl_rigging_symmetrize.py

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

diff --git a/intern/cycles/kernel/integrator/mnee.h b/intern/cycles/kernel/integrator/mnee.h
index 7b86c660380..2f7b711e28c 100644
--- a/intern/cycles/kernel/integrator/mnee.h
+++ b/intern/cycles/kernel/integrator/mnee.h
@@ -534,14 +534,8 @@ ccl_device_forceinline bool mnee_newton_solver(KernelGlobals kg,
       tv.dp_dv = mv.dp_dv;
 
       /* Setup corrected manifold vertex. */
-      mnee_setup_manifold_vertex(kg,
-                                 &tv,
-                                 mv.bsdf,
-                                 mv.eta,
-                                 mv.n_offset,
-                                 &projection_ray,
-                                 &projection_isect,
-                                 sd_vtx);
+      mnee_setup_manifold_vertex(
+          kg, &tv, mv.bsdf, mv.eta, mv.n_offset, &projection_ray, &projection_isect, sd_vtx);
 
       /* Fail newton solve if we are not making progress, probably stuck trying to move off the
        * edge of the mesh. */
@@ -1013,8 +1007,7 @@ ccl_device_forceinline int kernel_path_mnee_sample(KernelGlobals kg,
           }
 
           /* Setup differential geometry on vertex. */
-          mnee_setup_manifold_vertex(
-              kg, &mv, bsdf, eta, h, &probe_ray, &probe_isect, sd_mnee);
+          mnee_setup_manifold_vertex(kg, &mv, bsdf, eta, h, &probe_ray, &probe_isect, sd_mnee);
           break;
         }
       }
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index f5f1ae14369..94bad5459c9 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -734,7 +734,7 @@ class SEQUENCER_MT_add_scene(Menu):
 
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
-        layout.operator("sequencer.scene_strip_add_new", text="New Scene", icon="ADD").type='NEW'
+        layout.operator("sequencer.scene_strip_add_new", text="New Scene", icon="ADD").type = 'NEW'
 
         bpy_data_scenes_len = len(bpy.data.scenes)
         if bpy_data_scenes_len > 10:
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index a55eb74285d..a81ae934629 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -304,7 +304,7 @@ static void bm_log_faces_restore(BMesh *bm, BMLog *log, GHash *faces)
     f->head.hflag = lf->hflag;
     bm_log_face_id_set(log, f, POINTER_AS_UINT(key));
 
-  /* Ensure face sets have valid values.  Fixes T80174. */
+    /* Ensure face sets have valid values.  Fixes T80174. */
     if (cd_face_sets != -1) {
       BM_ELEM_CD_SET_INT(f, cd_face_sets, 1);
     }
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 161a097d154..7a15d9faf21 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -647,7 +647,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                    DST.dupli_source->random_id :
+                     DST.dupli_source->random_id :
                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
diff --git a/tests/python/bl_rigging_symmetrize.py b/tests/python/bl_rigging_symmetrize.py
index cac5e9b0856..6531b4df85f 100644
--- a/tests/python/bl_rigging_symmetrize.py
+++ b/tests/python/bl_rigging_symmetrize.py
@@ -134,7 +134,8 @@ def check_constraints(self, input_arm, expected_arm, bone, exp_bone):
                                  "Missmatching constraint boolean in pose.bones[%s].constraints[%s].%s" % (
                                      bone.name, const_name, var))
             else:
-                msg = "Missmatching constraint value in pose.bones[%s].constraints[%s].%s" % (bone.name, const_name, var)
+                msg = "Missmatching constraint value in pose.bones[%s].constraints[%s].%s" % (
+                    bone.name, const_name, var)
                 self.assertAlmostEqual(value, exp_value, places=6, msg=msg)



More information about the Bf-blender-cvs mailing list