diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-14 16:29:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-14 16:32:24 +0300 |
commit | 03b2371387dcae9f801cabbc1819b1d7e3350829 (patch) | |
tree | 0300655f20a06a8e5c807b5fe6263b47c686dedb /source/blender/windowmanager | |
parent | bc4fe45aef7e52f9e7a2bd5e370c6791c58af832 (diff) |
Cleanup: move trailing comments to avoid wrapping code
Some statements were split across multiple lines because of their
trailing comments.
In most cases it's clearer to put the comments above.
Diffstat (limited to 'source/blender/windowmanager')
4 files changed, 15 insertions, 8 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 5d6e405dd5d..cf87afa2a34 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -420,11 +420,14 @@ int WM_operator_call_py(struct bContext *C, struct ReportList *reports, const bool is_undo); +/* Used for keymap and macro items. */ void WM_operator_properties_alloc(struct PointerRNA **ptr, struct IDProperty **properties, - const char *opstring); /* used for keymap and macro items */ -void WM_operator_properties_sanitize( - struct PointerRNA *ptr, const bool no_context); /* make props context sensitive or not */ + const char *opstring); + +/* Make props context sensitive or not. */ +void WM_operator_properties_sanitize(struct PointerRNA *ptr, const bool no_context); + bool WM_operator_properties_default(struct PointerRNA *ptr, const bool do_update); void WM_operator_properties_reset(struct wmOperator *op); void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 88a4c13c4ca..832bf1e9b6d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1406,8 +1406,10 @@ static int wm_operator_invoke(bContext *C, if (WM_operator_poll(C, ot)) { wmWindowManager *wm = CTX_wm_manager(C); - wmOperator *op = wm_operator_create( - wm, ot, properties, reports); /* if reports == NULL, they'll be initialized */ + + /* if reports == NULL, they'll be initialized */ + wmOperator *op = wm_operator_create(wm, ot, properties, reports); + const bool is_nested_call = (wm->op_undo_depth != 0); if (event != NULL) { diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index f22b5d07686..fcb55d3f801 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -512,8 +512,9 @@ void WM_operator_properties_checker_interval_from_op(struct wmOperator *op, op_params->nth = nth; op_params->skip = skip; - op_params->offset = mod_i(offset, - nth + skip); /* so input of offset zero ends up being (nth - 1) */ + + /* So input of offset zero ends up being (nth - 1). */ + op_params->offset = mod_i(offset, nth + skip); } bool WM_operator_properties_checker_interval_test(const struct CheckerIntervalParams *op_params, diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index c984191076c..089f57c122e 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1653,12 +1653,13 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar 0.5f * U.widget_unit, U.dpi_fac * 501, U.dpi_fac * 250, + /* Button owns the imbuf now. */ ibuf, 0.0, 0.0, 0, 0, - ""); /* button owns the imbuf now */ + ""); UI_but_func_set(but, wm_block_splash_close, block, NULL); UI_block_func_set(block, wm_block_splash_refreshmenu, block, NULL); |