ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

4 files changed, 177 insertions, 188 deletions

diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 19b3e42b37a..1abc05d2270 100644
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -16,37 +16,37 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	../include
-	../../blenkernel
-	../../blenlib
-	../../gpu
-	../../makesdna
-	../../makesrna
-	../../windowmanager
-	../../../../intern/guardedalloc
-	../../../../intern/glew-mx
+  ../include
+  ../../blenkernel
+  ../../blenlib
+  ../../gpu
+  ../../makesdna
+  ../../makesrna
+  ../../windowmanager
+  ../../../../intern/guardedalloc
+  ../../../../intern/glew-mx
 )
 
 set(INC_SYS
-	${GLEW_INCLUDE_PATH}
+  ${GLEW_INCLUDE_PATH}
 )
 
 set(SRC
-	script_edit.c
-	script_ops.c
-	space_script.c
+  script_edit.c
+  script_ops.c
+  space_script.c
 
-	script_intern.h
+  script_intern.h
 )
 
 set(LIB
 )
 
 if(WITH_PYTHON)
-	list(APPEND INC
-		../../python
-	)
-	add_definitions(-DWITH_PYTHON)
+  list(APPEND INC
+    ../../python
+  )
+  add_definitions(-DWITH_PYTHON)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c
index 4b5cd6b7166..48248fe1dd2 100644
--- a/source/blender/editors/space_script/script_edit.c
+++ b/source/blender/editors/space_script/script_edit.c
@@ -21,7 +21,6 @@
  * \ingroup spscript
  */
 
-
 #include <string.h>
 #include <stdio.h>
 
@@ -40,69 +39,68 @@
 
 #include "ED_screen.h"
 
-
 #include "script_intern.h"  // own include
 
 #ifdef WITH_PYTHON
-#include "BPY_extern.h" /* BPY_script_exec */
+#  include "BPY_extern.h" /* BPY_script_exec */
 #endif
 
 static int run_pyfile_exec(bContext *C, wmOperator *op)
 {
-	char path[512];
-	RNA_string_get(op->ptr, "filepath", path);
+  char path[512];
+  RNA_string_get(op->ptr, "filepath", path);
 #ifdef WITH_PYTHON
-	if (BPY_execute_filepath(C, path, op->reports)) {
-		ARegion *ar = CTX_wm_region(C);
-		ED_region_tag_redraw(ar);
-		return OPERATOR_FINISHED;
-	}
+  if (BPY_execute_filepath(C, path, op->reports)) {
+    ARegion *ar = CTX_wm_region(C);
+    ED_region_tag_redraw(ar);
+    return OPERATOR_FINISHED;
+  }
 #else
-	(void)C; /* unused */
+  (void)C; /* unused */
 #endif
-	return OPERATOR_CANCELLED; /* FAIL */
+  return OPERATOR_CANCELLED; /* FAIL */
 }
 
 void SCRIPT_OT_python_file_run(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Run Python File";
-	ot->description = "Run Python file";
-	ot->idname = "SCRIPT_OT_python_file_run";
-	ot->flag = OPTYPE_UNDO;
+  /* identifiers */
+  ot->name = "Run Python File";
+  ot->description = "Run Python file";
+  ot->idname = "SCRIPT_OT_python_file_run";
+  ot->flag = OPTYPE_UNDO;
 
-	/* api callbacks */
-	ot->exec = run_pyfile_exec;
-	ot->poll = ED_operator_areaactive;
+  /* api callbacks */
+  ot->exec = run_pyfile_exec;
+  ot->poll = ED_operator_areaactive;
 
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
 
-	RNA_def_string_file_path(ot->srna, "filepath", NULL, FILE_MAX, "Path", "");
+  RNA_def_string_file_path(ot->srna, "filepath", NULL, FILE_MAX, "Path", "");
 }
 
 #ifdef WITH_PYTHON
 static bool script_test_modal_operators(bContext *C)
 {
-	wmWindowManager *wm;
-	wmWindow *win;
-
-	wm = CTX_wm_manager(C);
-
-	for (win = wm->windows.first; win; win = win->next) {
-		LISTBASE_FOREACH (wmEventHandler *, handler_base, &win->modalhandlers) {
-			if (handler_base->type == WM_HANDLER_TYPE_OP) {
-				wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base;
-				if (handler->op != NULL) {
-					wmOperatorType *ot = handler->op->type;
-					if (ot->ext.srna) {
-						return true;
-					}
-				}
-			}
-		}
-	}
-
-	return false;
+  wmWindowManager *wm;
+  wmWindow *win;
+
+  wm = CTX_wm_manager(C);
+
+  for (win = wm->windows.first; win; win = win->next) {
+    LISTBASE_FOREACH (wmEventHandler *, handler_base, &win->modalhandlers) {
+      if (handler_base->type == WM_HANDLER_TYPE_OP) {
+        wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base;
+        if (handler->op != NULL) {
+          wmOperatorType *ot = handler->op->type;
+          if (ot->ext.srna) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+
+  return false;
 }
 #endif
 
@@ -110,32 +108,33 @@ static int script_reload_exec(bContext *C, wmOperator *op)
 {
 #ifdef WITH_PYTHON
 
-	/* clear running operators */
-	if (script_test_modal_operators(C)) {
-		BKE_report(op->reports, RPT_ERROR, "Can't reload with running modal operators");
-		return OPERATOR_CANCELLED;
-	}
-
-	/* TODO, this crashes on netrender and keying sets, need to look into why
-	 * disable for now unless running in debug mode */
-	WM_cursor_wait(1);
-	BPY_execute_string(C, (const char *[]){"bpy", NULL}, "bpy.utils.load_scripts(reload_scripts=True)");
-	WM_cursor_wait(0);
-	WM_event_add_notifier(C, NC_WINDOW, NULL);
-	return OPERATOR_FINISHED;
+  /* clear running operators */
+  if (script_test_modal_operators(C)) {
+    BKE_report(op->reports, RPT_ERROR, "Can't reload with running modal operators");
+    return OPERATOR_CANCELLED;
+  }
+
+  /* TODO, this crashes on netrender and keying sets, need to look into why
+   * disable for now unless running in debug mode */
+  WM_cursor_wait(1);
+  BPY_execute_string(
+      C, (const char *[]){"bpy", NULL}, "bpy.utils.load_scripts(reload_scripts=True)");
+  WM_cursor_wait(0);
+  WM_event_add_notifier(C, NC_WINDOW, NULL);
+  return OPERATOR_FINISHED;
 #else
-	UNUSED_VARS(C, op);
-	return OPERATOR_CANCELLED;
+  UNUSED_VARS(C, op);
+  return OPERATOR_CANCELLED;
 #endif
 }
 
 void SCRIPT_OT_reload(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->name = "Reload Scripts";
-	ot->description = "Reload Scripts";
-	ot->idname = "SCRIPT_OT_reload";
+  /* identifiers */
+  ot->name = "Reload Scripts";
+  ot->description = "Reload Scripts";
+  ot->idname = "SCRIPT_OT_reload";
 
-	/* api callbacks */
-	ot->exec = script_reload_exec;
+  /* api callbacks */
+  ot->exec = script_reload_exec;
 }
diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c
index 3f800117346..3101bf6a7a7 100644
--- a/source/blender/editors/space_script/script_ops.c
+++ b/source/blender/editors/space_script/script_ops.c
@@ -21,25 +21,22 @@
  * \ingroup spscript
  */
 
-
 #include <stdlib.h>
 #include <math.h>
 
 #include "WM_api.h"
 
-
 #include "script_intern.h"
 
-
 /* ************************** registration **********************************/
 
 void script_operatortypes(void)
 {
-	WM_operatortype_append(SCRIPT_OT_python_file_run);
-	WM_operatortype_append(SCRIPT_OT_reload);
+  WM_operatortype_append(SCRIPT_OT_python_file_run);
+  WM_operatortype_append(SCRIPT_OT_reload);
 }
 
 void script_keymap(wmKeyConfig *UNUSED(keyconf))
 {
-	/* Script space is deprecated, and doesn't need a keymap */
+  /* Script space is deprecated, and doesn't need a keymap */
 }
diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c
index 45d6151e7b2..e26c0e3cec3 100644
--- a/source/blender/editors/space_script/space_script.c
+++ b/source/blender/editors/space_script/space_script.c
@@ -21,7 +21,6 @@
  * \ingroup spscript
  */
 
-
 #include <string.h>
 #include <stdio.h>
 
@@ -36,7 +35,6 @@
 #include "ED_space_api.h"
 #include "ED_screen.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -49,172 +47,167 @@
 #include "script_intern.h"  // own include
 #include "GPU_framebuffer.h"
 
-
 //static script_run_python(char *funcname, )
 
-
 /* ******************** default callbacks for script space ***************** */
 
 static SpaceLink *script_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
 {
-	ARegion *ar;
-	SpaceScript *sscript;
-
-	sscript = MEM_callocN(sizeof(SpaceScript), "initscript");
-	sscript->spacetype = SPACE_SCRIPT;
+  ARegion *ar;
+  SpaceScript *sscript;
 
+  sscript = MEM_callocN(sizeof(SpaceScript), "initscript");
+  sscript->spacetype = SPACE_SCRIPT;
 
-	/* header */
-	ar = MEM_callocN(sizeof(ARegion), "header for script");
+  /* header */
+  ar = MEM_callocN(sizeof(ARegion), "header for script");
 
-	BLI_addtail(&sscript->regionbase, ar);
-	ar->regiontype = RGN_TYPE_HEADER;
-	ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
+  BLI_addtail(&sscript->regionbase, ar);
+  ar->regiontype = RGN_TYPE_HEADER;
+  ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP;
 
-	/* main region */
-	ar = MEM_callocN(sizeof(ARegion), "main region for script");
+  /* main region */
+  ar = MEM_callocN(sizeof(ARegion), "main region for script");
 
-	BLI_addtail(&sscript->regionbase, ar);
-	ar->regiontype = RGN_TYPE_WINDOW;
+  BLI_addtail(&sscript->regionbase, ar);
+  ar->regiontype = RGN_TYPE_WINDOW;
 
-	/* channel list region XXX */
+  /* channel list region XXX */
 
-
-	return (SpaceLink *)sscript;
+  return (SpaceLink *)sscript;
 }
 
 /* not spacelink itself */
 static void script_free(SpaceLink *sl)
 {
-	SpaceScript *sscript = (SpaceScript *) sl;
+  SpaceScript *sscript = (SpaceScript *)sl;
 
 #ifdef WITH_PYTHON
-	/*free buttons references*/
-	if (sscript->but_refs) {
-// XXX		BPy_Set_DrawButtonsList(sscript->but_refs);
-//		BPy_Free_DrawButtonsList();
-		sscript->but_refs = NULL;
-	}
+  /*free buttons references*/
+  if (sscript->but_refs) {
+    // XXX      BPy_Set_DrawButtonsList(sscript->but_refs);
+    //      BPy_Free_DrawButtonsList();
+    sscript->but_refs = NULL;
+  }
 #endif
-	sscript->script = NULL;
+  sscript->script = NULL;
 }
 
-
 /* spacetype; init callback */
 static void script_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
 {
-
 }
 
 static SpaceLink *script_duplicate(SpaceLink *sl)
 {
-	SpaceScript *sscriptn = MEM_dupallocN(sl);
+  SpaceScript *sscriptn = MEM_dupallocN(sl);
 
-	/* clear or remove stuff from old */
+  /* clear or remove stuff from old */
 
-	return (SpaceLink *)sscriptn;
+  return (SpaceLink *)sscriptn;
 }
 
-
-
 /* add handlers, stuff you only do once or on area/region changes */
 static void script_main_region_init(wmWindowManager *wm, ARegion *ar)
 {
-	wmKeyMap *keymap;
+  wmKeyMap *keymap;
 
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
+  UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
 
-	/* own keymap */
-	keymap = WM_keymap_ensure(wm->defaultconf, "Script", SPACE_SCRIPT, 0);
-	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+  /* own keymap */
+  keymap = WM_keymap_ensure(wm->defaultconf, "Script", SPACE_SCRIPT, 0);
+  WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
 }
 
 static void script_main_region_draw(const bContext *C, ARegion *ar)
 {
-	/* draw entirely, view changes should be handled here */
-	SpaceScript *sscript = (SpaceScript *)CTX_wm_space_data(C);
-	View2D *v2d = &ar->v2d;
+  /* draw entirely, view changes should be handled here */
+  SpaceScript *sscript = (SpaceScript *)CTX_wm_space_data(C);
+  View2D *v2d = &ar->v2d;
 
-	/* clear and setup matrix */
-	UI_ThemeClearColor(TH_BACK);
-	GPU_clear(GPU_COLOR_BIT);
+  /* clear and setup matrix */
+  UI_ThemeClearColor(TH_BACK);
+  GPU_clear(GPU_COLOR_BIT);
 
-	UI_view2d_view_ortho(v2d);
+  UI_view2d_view_ortho(v2d);
 
-	/* data... */
-	// BPY_script_exec(C, "/root/blender-svn/blender25/test.py", NULL);
+  /* data... */
+  // BPY_script_exec(C, "/root/blender-svn/blender25/test.py", NULL);
 
 #ifdef WITH_PYTHON
-	if (sscript->script) {
-		// BPY_run_script_space_draw(C, sscript);
-	}
+  if (sscript->script) {
+    // BPY_run_script_space_draw(C, sscript);
+  }
 #else
-	(void)sscript;
+  (void)sscript;
 #endif
 
-	/* reset view matrix */
-	UI_view2d_view_restore(C);
+  /* reset view matrix */
+  UI_view2d_view_restore(C);
 
-	/* scrollers? */
+  /* scrollers? */
 }
 
 /* add handlers, stuff you only do once or on area/region changes */
 static void script_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
 {
-	ED_region_header_init(ar);
+  ED_region_header_init(ar);
 }
 
 static void script_header_region_draw(const bContext *C, ARegion *ar)
 {
-	ED_region_header(C, ar);
+  ED_region_header(C, ar);
 }
 
-static void script_main_region_listener(
-        wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
-        wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
+static void script_main_region_listener(wmWindow *UNUSED(win),
+                                        ScrArea *UNUSED(sa),
+                                        ARegion *UNUSED(ar),
+                                        wmNotifier *UNUSED(wmn),
+                                        const Scene *UNUSED(scene))
 {
-	/* context changes */
-	// XXX - Todo, need the ScriptSpace accessible to get the python script to run.
-	// BPY_run_script_space_listener()
+  /* context changes */
+  // XXX - Todo, need the ScriptSpace accessible to get the python script to run.
+  // BPY_run_script_space_listener()
 }
 
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_script(void)
 {
-	SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype script");
-	ARegionType *art;
-
-	st->spaceid = SPACE_SCRIPT;
-	strncpy(st->name, "Script", BKE_ST_MAXNAME);
-
-	st->new = script_new;
-	st->free = script_free;
-	st->init = script_init;
-	st->duplicate = script_duplicate;
-	st->operatortypes = script_operatortypes;
-	st->keymap = script_keymap;
-
-	/* regions: main window */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype script region");
-	art->regionid = RGN_TYPE_WINDOW;
-	art->init = script_main_region_init;
-	art->draw = script_main_region_draw;
-	art->listener = script_main_region_listener;
-	art->keymapflag = ED_KEYMAP_VIEW2D |   ED_KEYMAP_UI | ED_KEYMAP_FRAMES; // XXX need to further test this ED_KEYMAP_UI is needed for button interaction
-
-	BLI_addhead(&st->regiontypes, art);
-
-	/* regions: header */
-	art = MEM_callocN(sizeof(ARegionType), "spacetype script region");
-	art->regionid = RGN_TYPE_HEADER;
-	art->prefsizey = HEADERY;
-	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER;
-
-	art->init = script_header_region_init;
-	art->draw = script_header_region_draw;
-
-	BLI_addhead(&st->regiontypes, art);
-
-
-	BKE_spacetype_register(st);
+  SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype script");
+  ARegionType *art;
+
+  st->spaceid = SPACE_SCRIPT;
+  strncpy(st->name, "Script", BKE_ST_MAXNAME);
+
+  st->new = script_new;
+  st->free = script_free;
+  st->init = script_init;
+  st->duplicate = script_duplicate;
+  st->operatortypes = script_operatortypes;
+  st->keymap = script_keymap;
+
+  /* regions: main window */
+  art = MEM_callocN(sizeof(ARegionType), "spacetype script region");
+  art->regionid = RGN_TYPE_WINDOW;
+  art->init = script_main_region_init;
+  art->draw = script_main_region_draw;
+  art->listener = script_main_region_listener;
+  art->keymapflag =
+      ED_KEYMAP_VIEW2D | ED_KEYMAP_UI |
+      ED_KEYMAP_FRAMES;  // XXX need to further test this ED_KEYMAP_UI is needed for button interaction
+
+  BLI_addhead(&st->regiontypes, art);
+
+  /* regions: header */
+  art = MEM_callocN(sizeof(ARegionType), "spacetype script region");
+  art->regionid = RGN_TYPE_HEADER;
+  art->prefsizey = HEADERY;
+  art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER;
+
+  art->init = script_header_region_init;
+  art->draw = script_header_region_draw;
+
+  BLI_addhead(&st->regiontypes, art);
+
+  BKE_spacetype_register(st);
 }