diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender | |
parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
22 files changed, 87 insertions, 72 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index eac4dc81582..f320597ef2d 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -151,7 +151,7 @@ void id_sort_by_name(struct ListBase *lb, struct ID *id); void BKE_id_expand_local(struct Main *bmain, struct ID *id); void BKE_id_copy_ensure_local(struct Main *bmain, const struct ID *old_id, struct ID *new_id); -bool new_id(struct ListBase *lb, struct ID *id, const char *name); +bool new_id(struct ListBase *lb, struct ID *id, const char *name) ATTR_NONNULL(1, 2); void id_clear_lib_data(struct Main *bmain, struct ID *id); void id_clear_lib_data_ex(struct Main *bmain, struct ID *id, const bool id_in_mainlist); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 88a15d1fe3b..ba9ccf94303 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3591,8 +3591,8 @@ static bool tridiagonal_solve_with_limits(float *a, float *b, float *c, float *d * This function computes the handles of a series of auto bezier points * on the basis of 'no acceleration discontinuities' at the points. * The first and last bezier points are considered 'fixed' (their handles are not touched) - * The result is the smoothest possible trajectory going through intemediate points. - * The difficulty is that the handles depends on their neighbours. + * The result is the smoothest possible trajectory going through intermediate points. + * The difficulty is that the handles depends on their neighbors. * * The exact solution is found by solving a tridiagonal matrix equation formed * by the continuity and boundary conditions. Although theoretically handle position diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 667352b6ddb..cb045f7bae2 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1806,10 +1806,6 @@ bool new_id(ListBase *lb, ID *id, const char *tname) if (ID_IS_LINKED_DATABLOCK(id)) return false; - /* if no libdata given, look up based on ID */ - if (lb == NULL) - lb = which_libbase(G.main, GS(id->name)); - /* if no name given, use name of current ID * else make a copy (tname args can be const) */ if (tname == NULL) @@ -1964,7 +1960,7 @@ static void library_make_local_copying_check(ID *id, GSet *loop_tags, MainIDRela * * Current version uses regular id_make_local callback, with advanced pre-processing step to detect all cases of * IDs currently indirectly used, but which will be used by local data only once this function is finished. - * This allows to avoid any uneeded duplication of IDs, and hence all time lost afterwards to remove + * This allows to avoid any unneeded duplication of IDs, and hence all time lost afterwards to remove * orphaned linked data-blocks... */ void BKE_library_make_local( @@ -2353,7 +2349,6 @@ void BLI_libblock_ensure_unique_name(Main *bmain, const char *name) ListBase *lb; ID *idtest; - lb = which_libbase(bmain, GS(name)); if (lb == NULL) return; diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index e397dcf7667..e3706f7aedf 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -380,7 +380,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call if (bmain != NULL && bmain->relations != NULL && (flag & IDWALK_READONLY)) { /* Note that this is minor optimization, even in worst cases (like id being an object with lots of * drivers and constraints and modifiers, or material etc. with huge node tree), - * but we might as well use it (Main->relations is always assumed valid, it's responsability of code + * but we might as well use it (Main->relations is always assumed valid, it's responsibility of code * creating it to free it, especially if/when it starts modifying Main database). */ MainIDRelationsEntry *entry = BLI_ghash_lookup(bmain->relations->id_user_to_used, id); for (; entry != NULL; entry = entry->next) { diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 3ff4885f7fc..beecb063a20 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1325,7 +1325,7 @@ void ntreeUserDecrefID(bNodeTree *ntree) /* *************** Node Preview *********** */ /* XXX this should be removed eventually ... - * Currently BKE functions are modelled closely on previous code, + * Currently BKE functions are modeled closely on previous code, * using BKE_node_preview_init_tree to set up previews for a whole node tree in advance. * This should be left more to the individual node tree implementations. */ diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 187891e7210..e77edb21798 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1172,7 +1172,7 @@ static void pbvh_bmesh_split_edge( * * - faces wind anticlockwise in this example. * - original edge is ``(v1, v2)`` - * - oroginal face is ``(v1, v2, v3)`` + * - original face is ``(v1, v2, v3)`` * * <pre> * + v3(v_opp) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 2e4ff1c96a6..ccf2dc1f4c4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -884,7 +884,7 @@ BHead *blo_nextbhead(FileData *fd, BHead *thisblock) return(bhead); } -/* Warning! Caller's responsability to ensure given bhead **is** and ID one! */ +/* Warning! Caller's responsibility to ensure given bhead **is** and ID one! */ const char *bhead_id_name(const FileData *fd, const BHead *bhead) { return (const char *)POINTER_OFFSET(bhead, sizeof(*bhead) + fd->id_name_offs); diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 4f48dafd211..8e0e905cf88 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -120,7 +120,7 @@ static BMOpDefine bmo_smooth_vert_def = { }; /* - * Vertext Smooth Laplacian. + * Vertex Smooth Laplacian. * * Smooths vertices by using Laplacian smoothing propose by. * Desbrun, et al. Implicit Fairing of Irregular Meshes using Diffusion and Curvature Flow. diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 0d166b874cb..234355c8581 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -985,7 +985,9 @@ void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, const bool do_str } } -static bool ui_but_event_operator_string(const bContext *C, uiBut *but, char *buf, const size_t buf_len) +static bool ui_but_event_operator_string( + const bContext *C, uiBut *but, + char *buf, const size_t buf_len) { MenuType *mt; bool found = false; @@ -993,7 +995,10 @@ static bool ui_but_event_operator_string(const bContext *C, uiBut *but, char *bu if (but->optype) { IDProperty *prop = (but->opptr) ? but->opptr->data : NULL; - if (WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, true, buf_len, buf)) { + if (WM_key_event_operator_string( + C, but->optype->idname, but->opcontext, prop, true, + buf, buf_len)) + { found = true; } } @@ -1008,8 +1013,9 @@ static bool ui_but_event_operator_string(const bContext *C, uiBut *but, char *bu IDP_AssignString(prop_menu_name, mt->idname, sizeof(mt->idname)); - if (WM_key_event_operator_string(C, "WM_OT_call_menu", WM_OP_INVOKE_REGION_WIN, prop_menu, - true, buf_len, buf)) + if (WM_key_event_operator_string( + C, "WM_OT_call_menu", WM_OP_INVOKE_REGION_WIN, prop_menu, true, + buf, buf_len)) { found = true; } @@ -1021,8 +1027,10 @@ static bool ui_but_event_operator_string(const bContext *C, uiBut *but, char *bu return found; } -static bool ui_but_event_property_operator_string(const bContext *C, uiBut *but, char *buf, const size_t buf_len) -{ +static bool ui_but_event_property_operator_string( + const bContext *C, uiBut *but, + char *buf, const size_t buf_len) +{ /* context toggle operator names to check... */ const char *ctx_toggle_opnames[] = { "WM_OT_context_toggle", @@ -1116,8 +1124,9 @@ static bool ui_but_event_property_operator_string(const bContext *C, uiBut *but, /* check each until one works... */ for (i = 0; (i < num_ops) && (ctx_toggle_opnames[i]); i++) { - if (WM_key_event_operator_string(C, ctx_toggle_opnames[i], WM_OP_INVOKE_REGION_WIN, prop_path, false, - buf_len, buf)) + if (WM_key_event_operator_string( + C, ctx_toggle_opnames[i], WM_OP_INVOKE_REGION_WIN, prop_path, false, + buf, buf_len)) { found = true; break; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 84252c03742..2947365fc5d 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1288,7 +1288,7 @@ static bool ui_drag_toggle_set_xy_xy( } } if (changed) { - /* apply now, not on release (or if handlers are cancelled for whatever reason) */ + /* apply now, not on release (or if handlers are canceled for whatever reason) */ ui_apply_but_funcs_after(C); } @@ -6542,8 +6542,9 @@ static void but_shortcut_name_func(bContext *C, void *arg1, int UNUSED(event)) IDProperty *prop = (but->opptr) ? but->opptr->data : NULL; /* complex code to change name of button */ - if (WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, true, - sizeof(shortcut_str), shortcut_str)) + if (WM_key_event_operator_string( + C, but->optype->idname, but->opcontext, prop, true, + shortcut_str, sizeof(shortcut_str))) { ui_but_add_shortcut(but, shortcut_str, true); } @@ -8031,7 +8032,7 @@ static void button_activate_exit( ui_but_update(but); /* adds empty mousemove in queue for re-init handler, in case mouse is - * still over a button. we cannot just check for this ourselfs because + * still over a button. We cannot just check for this ourselves because * at this point the mouse may be over a button in another region */ if (mousemove) WM_event_add_mousemove(C); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 23ac1c5027d..d43b7511977 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -710,7 +710,7 @@ static uiBut *ui_item_with_label(uiLayout *layout, uiBlock *block, const char *n if (RNA_struct_is_a(ptr->type, &RNA_KeyMapItem)) { char buf[128]; - WM_keymap_item_to_string(ptr->data, false, sizeof(buf), buf); + WM_keymap_item_to_string(ptr->data, false, buf, sizeof(buf)); but = uiDefButR_prop(block, UI_BTYPE_HOTKEY_EVENT, 0, buf, x, y, w, h, ptr, prop, 0, 0, 0, -1, -1, NULL); UI_but_func_set(but, ui_keymap_but_cb, but, NULL); @@ -2017,8 +2017,9 @@ void uiItemMenuEnumO_ptr( (ot->prop && ot->invoke)) { char keybuf[128]; - if (WM_key_event_operator_string(C, ot->idname, layout->root->opcontext, NULL, false, - sizeof(keybuf), keybuf)) + if (WM_key_event_operator_string( + C, ot->idname, layout->root->opcontext, NULL, false, + keybuf, sizeof(keybuf))) { ui_but_add_shortcut(but, keybuf, false); } diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index e3d90ceb7a2..70e0f07ea6c 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -337,7 +337,7 @@ static uiTooltipData *ui_tooltip_data_from_keymap(bContext *C, wmKeyMap *keymap) .color_id = UI_TIP_LC_NORMAL, }); bool found = false; - if (WM_keymap_item_to_string(kmi, false, sizeof(buf), buf)) { + if (WM_keymap_item_to_string(kmi, false, buf, sizeof(buf))) { found = true; } field->text = BLI_sprintfN(TIP_("Shortcut: %s"), found ? buf : "None"); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index b52c4c3afb1..ae2c691b9d8 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -3615,8 +3615,9 @@ static void operator_search_cb(const bContext *C, void *UNUSED(arg), const char /* check for hotkey */ if (len < sizeof(name) - 6) { - if (WM_key_event_operator_string(C, ot->idname, WM_OP_EXEC_DEFAULT, NULL, true, - sizeof(name) - len - 1, &name[len + 1])) + if (WM_key_event_operator_string( + C, ot->idname, WM_OP_EXEC_DEFAULT, NULL, true, + &name[len + 1], sizeof(name) - len - 1)) { name[len] = UI_SEP_CHAR; } diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 40309b701a4..494cf3459df 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4370,7 +4370,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? IFACE_("right") : IFACE_("left"); char str_km[64]; - WM_modalkeymap_items_to_string(t->keymap, TFM_MODAL_INSERTOFS_TOGGLE_DIR, true, sizeof(str_km), str_km); + WM_modalkeymap_items_to_string(t->keymap, TFM_MODAL_INSERTOFS_TOGGLE_DIR, true, str_km, sizeof(str_km)); ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("Auto-offset set to %s - press %s to toggle direction | %s"), str_dir, str_km, str_old); @@ -4586,7 +4586,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) if (t->keymap) { wmKeyMapItem *kmi = WM_modalkeymap_find_propvalue(t->keymap, TFM_MODAL_RESIZE); if (kmi) { - ofs += WM_keymap_item_to_string(kmi, false, sizeof(str) - ofs, str + ofs); + ofs += WM_keymap_item_to_string(kmi, false, str + ofs, sizeof(str) - ofs); } } BLI_snprintf(str + ofs, sizeof(str) - ofs, IFACE_(" or Alt) Even Thickness %s"), @@ -8030,7 +8030,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA if (t->keymap) { wmKeyMapItem *kmi = WM_modalkeymap_find_propvalue(t->keymap, TFM_MODAL_TRANSLATE); if (kmi) { - ofs += WM_keymap_item_to_string(kmi, false, UI_MAX_DRAW_STR - ofs, str + ofs); + ofs += WM_keymap_item_to_string(kmi, false, str + ofs, UI_MAX_DRAW_STR - ofs); } } ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" or Alt) Expand to fit %s"), diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 9f1fdcfe551..b77847d6206 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -2038,7 +2038,7 @@ int GPU_scene_object_lights(SceneLayer *sl, float viewmat[4][4], int ortho) GPU_basic_shader_light_set(count, NULL); /* view direction for specular is not computed correct by default in - * opengl, so we set the settings ourselfs */ + * opengl, so we set the settings ourselves */ GPU_basic_shader_light_set_viewer(!ortho); int count = 0; diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 6e436b8ff32..e53533df782 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -676,7 +676,7 @@ static void rna_def_keyingset_info(BlenderRNA *brna) /* Regarding why we don't use rna_def_common_keying_flags() here: * - Using it would keep this case in sync with the other places - * where these options are exposed (which are optimised for being + * where these options are exposed (which are optimized for being * used in the UI). * - Unlike all the other places, this case is used for defining * new "built in" Keying Sets via the Python API. In that case, diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.h b/source/blender/render/intern/raytrace/rayobject_rtbuild.h index 83042ef3d7e..061d76e3a3e 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.h +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.h @@ -42,7 +42,7 @@ extern "C" { /* * Ray Tree Builder * this structs helps building any type of tree - * it contains several methods to organiza/split nodes + * it contains several methods to organize/split nodes * allowing to create a given tree on the fly. * * Idea is that other trees BVH, BIH can use this code to diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index 4f96e40d9ff..8a94472aaf5 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -68,7 +68,7 @@ wmKeyMapItem *WM_keymap_add_menu_pie(struct wmKeyMap *keymap, const char *idname int val, int modifier, int keymodifier); bool WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi); -int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, const int len, char *r_str); +int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, char *result, const int result_len); wmKeyMap *WM_keymap_list_find(ListBase *lb, const char *idname, int spaceid, int regionid); wmKeyMap *WM_keymap_find(struct wmKeyConfig *keyconf, const char *idname, int spaceid, int regionid); @@ -83,12 +83,14 @@ int WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2); /* Modal Keymap */ int WM_modalkeymap_items_to_string( - struct wmKeyMap *km, const int propvalue, const bool compact, const int len, char *r_str); + struct wmKeyMap *km, const int propvalue, const bool compact, + char *result, const int result_len); int WM_modalkeymap_operator_items_to_string( - struct wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str); + struct wmOperatorType *ot, const int propvalue, const bool compact, + char *result, const int result_len); char *WM_modalkeymap_operator_items_to_string_buf( struct wmOperatorType *ot, const int propvalue, const bool compact, - const int max_len, int *r_available_len, char **r_str); + const int max_len, int *r_available_len, char **r_result); wmKeyMap *WM_modalkeymap_add(struct wmKeyConfig *keyconf, const char *idname, const struct EnumPropertyItem *items); wmKeyMap *WM_modalkeymap_get(struct wmKeyConfig *keyconf, const char *idname); @@ -109,14 +111,16 @@ int WM_keymap_map_type_get(struct wmKeyMapItem *kmi); const char *WM_key_event_string(const short type, const bool compact); int WM_keymap_item_raw_to_string( const short shift, const short ctrl, const short alt, const short oskey, const short keymodifier, - const short val, const short type, const bool compact, const int len, char *r_str); + const short val, const short type, const bool compact, + char *result, const int result_len); wmKeyMapItem *WM_key_event_operator( const struct bContext *C, const char *opname, int opcontext, struct IDProperty *properties, const bool is_hotkey, struct wmKeyMap **r_keymap); -char *WM_key_event_operator_string( +char *WM_key_event_operator_string( const struct bContext *C, const char *opname, int opcontext, - struct IDProperty *properties, const bool is_strict, int len, char *r_str); + struct IDProperty *properties, const bool is_strict, + char *result, const int result_len); const char *WM_bool_as_string(bool test); diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 5580d3217a5..528b9e2b3d9 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -379,7 +379,7 @@ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test) } } - /* possible suspend ourselfs, waiting for other jobs, or de-suspend */ + /* Possible suspend ourselves, waiting for other jobs, or de-suspend. */ test->suspended = suspend; // if (suspend) printf("job suspended: %s\n", test->name); } diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 8dab50a6f29..910b7eadf4c 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -940,7 +940,7 @@ const char *WM_key_event_string(const short type, const bool compact) int WM_keymap_item_raw_to_string( const short shift, const short ctrl, const short alt, const short oskey, const short keymodifier, const short val, const short type, const bool compact, - const int len, char *r_str) + char *result, const int result_len) { #define ADD_SEP if (p != buf) *p++ = ' '; (void)0 @@ -1000,20 +1000,23 @@ int WM_keymap_item_raw_to_string( BLI_assert(p - buf < sizeof(buf)); /* We need utf8 here, otherwise we may 'cut' some unicode chars like arrows... */ - return BLI_strncpy_utf8_rlen(r_str, buf, len); + return BLI_strncpy_utf8_rlen(result, buf, result_len); #undef ADD_SEP } -int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, const int len, char *r_str) +int WM_keymap_item_to_string( + wmKeyMapItem *kmi, const bool compact, + char *result, const int result_len) { return WM_keymap_item_raw_to_string( - kmi->shift, kmi->ctrl, kmi->alt, kmi->oskey, kmi->keymodifier, kmi->val, kmi->type, - compact, len, r_str); + kmi->shift, kmi->ctrl, kmi->alt, kmi->oskey, kmi->keymodifier, kmi->val, kmi->type, + compact, result, result_len); } int WM_modalkeymap_items_to_string( - wmKeyMap *km, const int propvalue, const bool compact, const int len, char *r_str) + wmKeyMap *km, const int propvalue, const bool compact, + char *result, const int result_len) { int totlen = 0; bool add_sep = false; @@ -1023,17 +1026,17 @@ int WM_modalkeymap_items_to_string( /* Find all shortcuts related to that propvalue! */ for (kmi = WM_modalkeymap_find_propvalue(km, propvalue); - kmi && totlen < (len - 2); + kmi && totlen < (result_len - 2); kmi = wm_modalkeymap_find_propvalue_iter(km, kmi, propvalue)) { if (add_sep) { - r_str[totlen++] = '/'; - r_str[totlen] = '\0'; + result[totlen++] = '/'; + result[totlen] = '\0'; } else { add_sep = true; } - totlen += WM_keymap_item_to_string(kmi, compact, len - totlen, &r_str[totlen]); + totlen += WM_keymap_item_to_string(kmi, compact, &result[totlen], result_len - totlen); } } @@ -1041,25 +1044,26 @@ int WM_modalkeymap_items_to_string( } int WM_modalkeymap_operator_items_to_string( - wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str) + wmOperatorType *ot, const int propvalue, const bool compact, + char *result, const int result_len) { - return WM_modalkeymap_items_to_string(ot->modalkeymap, propvalue, compact, len, r_str); + return WM_modalkeymap_items_to_string(ot->modalkeymap, propvalue, compact, result, result_len); } char *WM_modalkeymap_operator_items_to_string_buf( wmOperatorType *ot, const int propvalue, const bool compact, - const int max_len, int *r_available_len, char **r_str) + const int max_len, int *r_available_len, char **r_result) { - char *ret = *r_str; + char *ret = *r_result; if (*r_available_len > 1) { int used_len = WM_modalkeymap_operator_items_to_string( - ot, propvalue, compact, min_ii(*r_available_len, max_len), ret) + 1; + ot, propvalue, compact, ret, min_ii(*r_available_len, max_len)) + 1; *r_available_len -= used_len; - *r_str += used_len; + *r_result += used_len; if (*r_available_len == 0) { - (*r_str)--; /* So that *str keeps pointing on a valid char, we'll stay on it anyway. */ + (*r_result)--; /* So that *result keeps pointing on a valid char, we'll stay on it anyway. */ } } else { @@ -1126,7 +1130,7 @@ static wmKeyMapItem *wm_keymap_item_find_handlers( if (IDP_EqualsProperties_ex(properties, properties_default, is_strict)) { char kmi_str[128]; - WM_keymap_item_to_string(kmi, false, sizeof(kmi_str), kmi_str); + WM_keymap_item_to_string(kmi, false, kmi_str, sizeof(kmi_str)); /* Note gievn properties could come from other things than menu entry... */ printf("%s: Some set values in menu entry match default op values, " "this might not be desired!\n", opname); @@ -1276,7 +1280,7 @@ static wmKeyMapItem *wm_keymap_item_find( kmi = wm_keymap_item_find_props(C, opname, opcontext, properties_default, is_strict, is_hotkey, &km); if (kmi) { char kmi_str[128]; - WM_keymap_item_to_string(kmi, false, sizeof(kmi_str), kmi_str); + WM_keymap_item_to_string(kmi, false, kmi_str, sizeof(kmi_str)); printf("%s: Some set values in keymap entry match default op values, " "this might not be desired!\n", opname); printf("\tkm: '%s', kmi: '%s'\n", km->idname, kmi_str); @@ -1302,13 +1306,14 @@ static wmKeyMapItem *wm_keymap_item_find( char *WM_key_event_operator_string( const bContext *C, const char *opname, int opcontext, - IDProperty *properties, const bool is_strict, int len, char *r_str) + IDProperty *properties, const bool is_strict, + char *result, const int result_len) { wmKeyMapItem *kmi = wm_keymap_item_find(C, opname, opcontext, properties, false, is_strict, NULL); - + if (kmi) { - WM_keymap_item_to_string(kmi, false, len, r_str); - return r_str; + WM_keymap_item_to_string(kmi, false, result, result_len); + return result; } return NULL; diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 8600bc63cb7..6b858c49a1e 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1461,7 +1461,7 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2) wmOpPopUp *data = arg1; uiBlock *block = arg2; - /* Explicitly set UI_RETURN_OK flag, otherwise the menu might be cancelled + /* Explicitly set UI_RETURN_OK flag, otherwise the menu might be canceled * in case WM_operator_call_ex exits/reloads the current file (T49199). */ UI_popup_menu_retval_set(block, UI_RETURN_OK, true); diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index 7e217122561..c14517f1662 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -72,7 +72,7 @@ typedef struct wmEventHandler { struct wmManipulatorMap *manipulator_map; } wmEventHandler; -/* custom types for handlers, for signalling, freeing */ +/* custom types for handlers, for signaling, freeing */ enum { WM_HANDLER_DEFAULT, WM_HANDLER_FILESELECT @@ -99,4 +99,3 @@ void wm_drags_check_ops(bContext *C, const wmEvent *event); void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect); #endif /* __WM_EVENT_SYSTEM_H__ */ - |