diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/windowmanager | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_keymap.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_cursors.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_draw.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_files.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_window.h | 1 |
11 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index 9390db400d2..2e1b900a93d 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -132,4 +132,3 @@ const char *WM_bool_as_string(bool test); #endif #endif /* __WM_KEYMAP_H__ */ - diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 339271e354e..5abc0b2d48b 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -730,4 +730,3 @@ extern struct CLG_LogRef *WM_LOG_MSGBUS_SUB; #endif #endif /* __WM_TYPES_H__ */ - diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 7eeea0f64ee..701ad49b520 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -549,5 +549,3 @@ void WM_main(bContext *C) wm_draw_update(C); } } - - diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index a7500a55bda..5b88268f416 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -853,4 +853,3 @@ void WM_redraw_windows(bContext *C) CTX_wm_area_set(C, area_prev); CTX_wm_region_set(C, ar_prev); } - diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c index 1b5225a2f04..b32eb84e289 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c @@ -195,4 +195,3 @@ void wm_manipulatorgrouptype_init(void) } /** \} */ - diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h b/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h index 7b294b9320f..a470c5c28ea 100644 --- a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h +++ b/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h @@ -95,4 +95,3 @@ struct ListBase *wm_manipulatormap_groups_get(wmManipulatorMap *mmap); void wm_manipulatormaptypes_free(void); #endif /* __WM_MANIPULATOR_WMAPI_H__ */ - diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h index 939409f9511..f863d8bfdd9 100644 --- a/source/blender/windowmanager/wm_cursors.h +++ b/source/blender/windowmanager/wm_cursors.h @@ -115,4 +115,3 @@ bool wm_cursor_arrow_move(struct wmWindow *win, const struct wmEvent *event); #endif /* __WM_CURSORS_H__ */ - diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h index 3761cd043a2..1e0f3cd6b35 100644 --- a/source/blender/windowmanager/wm_draw.h +++ b/source/blender/windowmanager/wm_draw.h @@ -57,4 +57,3 @@ void wm_draw_region_blend(struct ARegion *ar, int view, bool blend); struct GPUTexture *wm_draw_region_texture(struct ARegion *ar, int view); #endif /* __WM_DRAW_H__ */ - diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index be648628079..3f98b6ef512 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -460,4 +460,3 @@ enum { #endif /* __WM_EVENT_TYPES_H__ */ - diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h index 5b6022658db..e1725156012 100644 --- a/source/blender/windowmanager/wm_files.h +++ b/source/blender/windowmanager/wm_files.h @@ -68,4 +68,3 @@ void WM_OT_lib_relocate(struct wmOperatorType *ot); void WM_OT_lib_reload(struct wmOperatorType *ot); #endif /* __WM_FILES_H__ */ - diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index 305a5387c96..952ffe5c117 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -94,4 +94,3 @@ int wm_window_new_exec(bContext *C, struct wmOperator *op); #define WM_WIN_INIT_PAD 40 #endif /* __WM_WINDOW_H__ */ - |