[Bf-blender-cvs] [112a532f416] soc-2021-uv-editor-improvements: Cleanup: make format

Aaron Carlisle noreply at git.blender.org
Mon Aug 9 03:24:42 CEST 2021


Commit: 112a532f416f0474515065cd43cf382d7a8c5cd5
Author: Aaron Carlisle
Date:   Wed Aug 4 19:24:19 2021 -0400
Branches: soc-2021-uv-editor-improvements
https://developer.blender.org/rB112a532f416f0474515065cd43cf382d7a8c5cd5

Cleanup: make format

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

M	source/blender/draw/engines/overlay/shaders/edit_mesh_normal_vert.glsl
M	source/blender/editors/include/ED_keyframes_keylist.h
M	source/blender/python/gpu/gpu_py_offscreen.c

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

diff --git a/source/blender/draw/engines/overlay/shaders/edit_mesh_normal_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_mesh_normal_vert.glsl
index f649a5cb3ed..d370943db03 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_mesh_normal_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_mesh_normal_vert.glsl
@@ -56,8 +56,7 @@ void main()
   if (gl_VertexID == 0) {
     if (isConstantScreenSizeNormals) {
       bool is_persp = (ProjectionMatrix[3][3] == 0.0);
-      if (is_persp)
-      {
+      if (is_persp) {
         float dist_fac = length(cameraPos - world_pos);
         float cos_fac = dot(cameraForward, cameraVec(world_pos));
         world_pos += n * normalScreenSize * dist_fac * cos_fac * pixelFac * sizePixel;
diff --git a/source/blender/editors/include/ED_keyframes_keylist.h b/source/blender/editors/include/ED_keyframes_keylist.h
index e7d1b5d4363..d3690fa3aa0 100644
--- a/source/blender/editors/include/ED_keyframes_keylist.h
+++ b/source/blender/editors/include/ED_keyframes_keylist.h
@@ -190,7 +190,9 @@ void gpencil_to_keylist(struct bDopeSheet *ads,
 /* Grease Pencil Layer */
 void gpl_to_keylist(struct bDopeSheet *ads, struct bGPDlayer *gpl, struct AnimKeylist *keylist);
 /* Mask */
-void mask_to_keylist(struct bDopeSheet *ads, struct MaskLayer *masklay, struct AnimKeylist *keylist);
+void mask_to_keylist(struct bDopeSheet *ads,
+                     struct MaskLayer *masklay,
+                     struct AnimKeylist *keylist);
 
 /* ActKeyColumn API ---------------- */
 /* Comparator callback used for ActKeyColumns and cframe float-value pointer */
diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c
index 02f72f20ac4..32053df5e97 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.c
+++ b/source/blender/python/gpu/gpu_py_offscreen.c
@@ -279,7 +279,8 @@ static PyObject *pygpu_offscreen_texture_color_get(BPyGPUOffScreen *self, void *
 
 PyDoc_STRVAR(
     pygpu_offscreen_draw_view3d_doc,
-    ".. method:: draw_view3d(scene, view_layer, view3d, region, view_matrix, projection_matrix, do_color_management=False)\n"
+    ".. method:: draw_view3d(scene, view_layer, view3d, region, view_matrix, projection_matrix, "
+    "do_color_management=False)\n"
     "\n"
     "   Draw the 3d viewport in the offscreen object.\n"
     "\n"
@@ -312,8 +313,14 @@ static PyObject *pygpu_offscreen_draw_view3d(BPyGPUOffScreen *self, PyObject *ar
 
   BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
 
-  static const char *_keywords[] = {
-      "scene", "view_layer", "view3d", "region", "view_matrix", "projection_matrix", "do_color_management", NULL};
+  static const char *_keywords[] = {"scene",
+                                    "view_layer",
+                                    "view3d",
+                                    "region",
+                                    "view_matrix",
+                                    "projection_matrix",
+                                    "do_color_management",
+                                    NULL};
 
   static _PyArg_Parser _parser = {"OOOOO&O&|$O&:draw_view3d", _keywords, 0};
   if (!_PyArg_ParseTupleAndKeywordsFast(args,
@@ -327,7 +334,7 @@ static PyObject *pygpu_offscreen_draw_view3d(BPyGPUOffScreen *self, PyObject *ar
                                         &py_mat_view,
                                         Matrix_Parse4x4,
                                         &py_mat_projection,
-                                        PyC_ParseBool, 
+                                        PyC_ParseBool,
                                         &do_color_management) ||
       (!(scene = PyC_RNA_AsPointer(py_scene, "Scene")) ||
        !(view_layer = PyC_RNA_AsPointer(py_view_layer, "ViewLayer")) ||



More information about the Bf-blender-cvs mailing list