From 09ea19c76e3f16396be48b50998211ae02b193fa Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Thu, 25 Aug 2016 23:44:06 +0200 Subject: Fix whitespace in new code for Stats Editor. --- source/blender/editors/space_stats/CMakeLists.txt | 16 ++-- source/blender/editors/space_stats/space_stats.c | 104 +++++++++++----------- source/blender/makesdna/DNA_space_types.h | 8 +- source/blender/makesrna/intern/rna_space.c | 10 +-- 4 files changed, 69 insertions(+), 69 deletions(-) diff --git a/source/blender/editors/space_stats/CMakeLists.txt b/source/blender/editors/space_stats/CMakeLists.txt index e34b7e6a1f9..d11156ec745 100644 --- a/source/blender/editors/space_stats/CMakeLists.txt +++ b/source/blender/editors/space_stats/CMakeLists.txt @@ -19,13 +19,13 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - ../include - ../../blenkernel - ../../blenlib - ../../makesdna - ../../makesrna - ../../windowmanager - ../../../../intern/guardedalloc + ../include + ../../blenkernel + ../../blenlib + ../../makesdna + ../../makesrna + ../../windowmanager + ../../../../intern/guardedalloc ) set(INC_SYS @@ -33,7 +33,7 @@ set(INC_SYS ) set(SRC - space_stats.c + space_stats.c ) blender_add_lib(bf_editor_space_stats "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_stats/space_stats.c b/source/blender/editors/space_stats/space_stats.c index fc8480cbfd9..3ebd3212d02 100644 --- a/source/blender/editors/space_stats/space_stats.c +++ b/source/blender/editors/space_stats/space_stats.c @@ -45,96 +45,96 @@ static SpaceLink *stats_new(const bContext *UNUSED(C)) { - ARegion *ar; - SpaceStats *sstats; + ARegion *ar; + SpaceStats *sstats; - sstats = MEM_callocN(sizeof(SpaceStats), __func__); - sstats->spacetype = SPACE_STATS; + sstats = MEM_callocN(sizeof(SpaceStats), __func__); + sstats->spacetype = SPACE_STATS; - /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for stats editor"); + /* header */ + ar = MEM_callocN(sizeof(ARegion), "header for stats editor"); - BLI_addtail(&sstats->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = RGN_ALIGN_BOTTOM; + BLI_addtail(&sstats->regionbase, ar); + ar->regiontype = RGN_TYPE_HEADER; + ar->alignment = RGN_ALIGN_BOTTOM; - /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for stats editor"); + /* main region */ + ar = MEM_callocN(sizeof(ARegion), "main region for stats editor"); - BLI_addtail(&sstats->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; + BLI_addtail(&sstats->regionbase, ar); + ar->regiontype = RGN_TYPE_WINDOW; - return (SpaceLink *)sstats; + return (SpaceLink *)sstats; } static SpaceLink *stats_duplicate(SpaceLink *sl) { - SpaceStats *sstats = MEM_dupallocN(sl); + SpaceStats *sstats = MEM_dupallocN(sl); - /* clear or remove stuff from old */ + /* clear or remove stuff from old */ - return (SpaceLink *)sstats; + return (SpaceLink *)sstats; } /* add handlers, stuff you only do once or on area/region changes */ static void stats_main_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { - /* do not use here, the properties changed in userprefs do a system-wide refresh, then scroller jumps back */ - /* ar->v2d.flag &= ~V2D_IS_INITIALISED; */ + /* do not use here, the properties changed in userprefs do a system-wide refresh, then scroller jumps back */ + /* ar->v2d.flag &= ~V2D_IS_INITIALISED; */ - ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; } static void stats_main_region_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar)) { - printf("Look Sergey, it's an Editor!\n"); + printf("Look Sergey, it's an Editor!\n"); } /* add handlers, stuff you only do once or on area/region changes */ static void stats_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { - ED_region_header_init(ar); + ED_region_header_init(ar); } static void stats_header_region_draw(const bContext *C, ARegion *ar) { - ED_region_header(C, ar); + ED_region_header(C, ar); } static void stats_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn)) { - /* context changes */ + /* context changes */ } /* only called once, from space/spacetypes.c */ void ED_spacetype_stats(void) { - SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype stats"); - ARegionType *art; - - st->spaceid = SPACE_STATS; - strncpy(st->name, "StatsEditor", BKE_ST_MAXNAME); - - st->new = stats_new; - st->duplicate = stats_duplicate; - - /* regions: main window */ - art = MEM_callocN(sizeof(ARegionType), "stats editor region"); - art->regionid = RGN_TYPE_WINDOW; - art->init = stats_main_region_init; - art->draw = stats_main_region_draw; - art->listener = stats_main_region_listener; - art->keymapflag = ED_KEYMAP_UI; - BLI_addhead(&st->regiontypes, art); - - /* regions: header */ - art = MEM_callocN(sizeof(ARegionType), "spacetype stats header"); - art->regionid = RGN_TYPE_HEADER; - art->prefsizey = HEADERY; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; - art->init = stats_header_region_init; - art->draw = stats_header_region_draw; - BLI_addhead(&st->regiontypes, art); - - BKE_spacetype_register(st); + SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype stats"); + ARegionType *art; + + st->spaceid = SPACE_STATS; + strncpy(st->name, "StatsEditor", BKE_ST_MAXNAME); + + st->new = stats_new; + st->duplicate = stats_duplicate; + + /* regions: main window */ + art = MEM_callocN(sizeof(ARegionType), "stats editor region"); + art->regionid = RGN_TYPE_WINDOW; + art->init = stats_main_region_init; + art->draw = stats_main_region_draw; + art->listener = stats_main_region_listener; + art->keymapflag = ED_KEYMAP_UI; + BLI_addhead(&st->regiontypes, art); + + /* regions: header */ + art = MEM_callocN(sizeof(ARegionType), "spacetype stats header"); + art->regionid = RGN_TYPE_HEADER; + art->prefsizey = HEADERY; + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; + art->init = stats_header_region_init; + art->draw = stats_header_region_draw; + BLI_addhead(&st->regiontypes, art); + + BKE_spacetype_register(st); } diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index f1417e3abdf..bdcd6a9c1db 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -1336,10 +1336,10 @@ typedef enum eSpaceClip_GPencil_Source { /* Stats Editor ======================================= */ typedef struct SpaceStats { - SpaceLink *next, *prev; - ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - int pad; + SpaceLink *next, *prev; + ListBase regionbase; /* storage of regions for inactive spaces */ + int spacetype; + int pad; } SpaceStats; /* **************** SPACE DEFINES ********************* */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d661728c588..d8c36cbcf24 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -79,7 +79,7 @@ EnumPropertyItem rna_enum_space_type_items[] = { {0, "", ICON_NONE, NULL, NULL}, {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", "Edit properties of active object and related data-blocks"}, {SPACE_OUTLINER, "OUTLINER", ICON_OOPS, "Outliner", "Overview of scene graph and all available data-blocks"}, - {SPACE_STATS, "STATS", ICON_OOPS, "Statistics", "Display various statistics and logs"}, + {SPACE_STATS, "STATS", ICON_OOPS, "Statistics", "Display various statistics and logs"}, {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", "Edit persistent configuration settings"}, {SPACE_INFO, "INFO", ICON_INFO, "Info", "Main menu bar and list of error messages (drag down to expand and display)"}, {0, "", ICON_NONE, NULL, NULL}, @@ -4740,11 +4740,11 @@ static void rna_def_space_clip(BlenderRNA *brna) static void rna_def_space_stats(BlenderRNA *brna) { - StructRNA *srna; + StructRNA *srna; - srna = RNA_def_struct(brna, "SpaceStatsEditor", "Space"); - RNA_def_struct_sdna(srna, "SpaceStats"); - RNA_def_struct_ui_text(srna, "Space Stats Editor", "Stats Editor space data"); + srna = RNA_def_struct(brna, "SpaceStatsEditor", "Space"); + RNA_def_struct_sdna(srna, "SpaceStats"); + RNA_def_struct_ui_text(srna, "Space Stats Editor", "Stats Editor space data"); } -- cgit v1.2.3