[Bf-blender-cvs] [750a65bbf2e] tracking_tools: Cleanup: Clang format

Aaron Carlisle noreply at git.blender.org
Mon Jul 19 23:14:02 CEST 2021


Commit: 750a65bbf2e46352ce1a96900041de4bb6d9d3cc
Author: Aaron Carlisle
Date:   Mon Jul 19 17:13:49 2021 -0400
Branches: tracking_tools
https://developer.blender.org/rB750a65bbf2e46352ce1a96900041de4bb6d9d3cc

Cleanup: Clang format

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

M	source/blender/editors/space_clip/space_clip.c
M	source/blender/makesrna/intern/rna_workspace.c
M	source/blender/windowmanager/WM_toolsystem.h
M	source/blender/windowmanager/intern/wm_toolsystem.c

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

diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index fd164b75dc9..ee07a26e6f5 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -256,7 +256,6 @@ static SpaceLink *clip_create(const ScrArea *area, const Scene *scene)
   region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
   region->flag = RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER;
 
-
   /* header */
   region = MEM_callocN(sizeof(ARegion), "header for clip");
 
@@ -1380,7 +1379,8 @@ void ED_spacetype_clip(void)
   art->init = clip_main_region_init;
   art->draw = clip_main_region_draw;
   art->listener = clip_main_region_listener;
-  art->keymapflag = ED_KEYMAP_GIZMO | ED_KEYMAP_FRAMES | ED_KEYMAP_UI | ED_KEYMAP_GPENCIL | ED_KEYMAP_TOOL;
+  art->keymapflag = ED_KEYMAP_GIZMO | ED_KEYMAP_FRAMES | ED_KEYMAP_UI | ED_KEYMAP_GPENCIL |
+                    ED_KEYMAP_TOOL;
 
   BLI_addhead(&st->regiontypes, art);
 
@@ -1417,7 +1417,7 @@ void ED_spacetype_clip(void)
 
   BLI_addhead(&st->regiontypes, art);
 
-    /* regions: tool(bar) */
+  /* regions: tool(bar) */
   art = MEM_callocN(sizeof(ARegionType), "spacetype clip region tools");
   art->regionid = RGN_TYPE_TOOLS;
   art->prefsizex = 58;
diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c
index b18ca8f0c7b..408e6d2451e 100644
--- a/source/blender/makesrna/intern/rna_workspace.c
+++ b/source/blender/makesrna/intern/rna_workspace.c
@@ -388,10 +388,10 @@ static void rna_def_workspace_tools(BlenderRNA *brna, PropertyRNA *cprop)
   parm = RNA_def_enum(func, "mode", rna_enum_clip_editor_mode_items, 0, "", "");
   RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
   RNA_def_boolean(func, "create", false, "Create", "");
-   /*return type */
+  /*return type */
   parm = RNA_def_pointer(func, "result", "WorkSpaceTool", "", "");
   RNA_def_function_return(func, parm);
-	}
+}
 
 static void rna_def_workspace(BlenderRNA *brna)
 {
diff --git a/source/blender/windowmanager/WM_toolsystem.h b/source/blender/windowmanager/WM_toolsystem.h
index f6b277e8f10..59a5f315524 100644
--- a/source/blender/windowmanager/WM_toolsystem.h
+++ b/source/blender/windowmanager/WM_toolsystem.h
@@ -41,7 +41,8 @@ struct wmOperatorType;
 /* wm_toolsystem.c */
 
 #define WM_TOOLSYSTEM_SPACE_MASK \
-  ((1 << SPACE_IMAGE) | (1 << SPACE_NODE) | (1 << SPACE_VIEW3D) | (1 << SPACE_SEQ) | (1 << SPACE_CLIP))
+  ((1 << SPACE_IMAGE) | (1 << SPACE_NODE) | (1 << SPACE_VIEW3D) | (1 << SPACE_SEQ) | \
+   (1 << SPACE_CLIP))
 /* Values that define a category of active tool. */
 typedef struct bToolKey {
   int space_type;
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index a8ec98d0252..5627aaed990 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -729,7 +729,7 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
   }
 
   return "builtin.select_box";
-  }
+}
 
 /**
  * Run after changing modes.



More information about the Bf-blender-cvs mailing list