diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:36:37 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:36:37 +0300 |
| commit | 2b83d81f68e18f60955c72cd61b3cdc62670c69a (patch) | |
| tree | 971e8e8391a852733a8d2bf4e617633bec84912c /source/blender/editors/space_userpref/space_userpref.c | |
| parent | d3fe0338752de05916bb3e3e15bb3c5ef4d18dc5 (diff) | |
| parent | 70f8eaf1b769c402ec61d86f25237d6b64186861 (diff) | |
Merge branch 'blender2.8' into ui_layout_gridflow
Diffstat (limited to 'source/blender/editors/space_userpref/space_userpref.c')
| -rw-r--r-- | source/blender/editors/space_userpref/space_userpref.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index 95d0a246ccd..b3f45de518b 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -77,9 +77,9 @@ static SpaceLink *userpref_new(const ScrArea *UNUSED(area), const Scene *UNUSED( /* not spacelink itself */ static void userpref_free(SpaceLink *UNUSED(sl)) -{ +{ // SpaceUserPref *spref = (SpaceUserPref *)sl; - + } @@ -105,7 +105,7 @@ static void userpref_main_region_init(wmWindowManager *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; */ - + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; ED_region_panels_init(wm, ar); @@ -122,7 +122,7 @@ static void userpref_operatortypes(void) static void userpref_keymap(struct wmKeyConfig *UNUSED(keyconf)) { - + } /* add handlers, stuff you only do once or on area/region changes */ |