diff options
Diffstat (limited to 'source/blender/editors/interface')
8 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 6e1398549a6..1b9dfd8b1f9 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1534,14 +1534,14 @@ void ui_get_but_vectorf(uiBut *but, float vec[3]) } } else if (but->pointype == UI_BUT_POIN_CHAR) { - char *cp = (char *)but->poin; + const char *cp = (char *)but->poin; vec[0] = ((float)cp[0]) / 255.0f; vec[1] = ((float)cp[1]) / 255.0f; vec[2] = ((float)cp[2]) / 255.0f; } else if (but->pointype == UI_BUT_POIN_FLOAT) { - float *fp = (float *)but->poin; + const float *fp = (float *)but->poin; copy_v3_v3(vec, fp); } else { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 380f94883be..10951c62a51 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7293,7 +7293,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar) if (dyn_data->items_filter_neworder || dyn_data->items_filter_flags) { /* If we have a display order different from collection order, we have some work! */ int *org_order = MEM_mallocN(dyn_data->items_shown * sizeof(int), __func__); - int *new_order = dyn_data->items_filter_neworder; + const int *new_order = dyn_data->items_filter_neworder; int i, org_idx = -1, len = dyn_data->items_len; int current_idx = -1; int filter_exclude = ui_list->filter_flag & UILST_FLT_EXCLUDE; diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 0f988008b2c..f580bd6b5f2 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -719,7 +719,7 @@ static void init_iconfile_list(struct ListBase *list) for (i = 0; i < totfile; i++) { if ((dir[i].type & S_IFREG)) { - char *filename = dir[i].relname; + const char *filename = dir[i].relname; if (BLI_testextensie(filename, ".png")) { /* loading all icons on file start is overkill & slows startup diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index cef7128cd5e..316a4d34881 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -659,7 +659,7 @@ static void edittranslation_find_po_file(const char *root, const char *uilng, ch /* Now try without the second iso code part (_ES in es_ES). */ { - char *tc = NULL; + const char *tc = NULL; size_t szt = 0; tstr[0] = '\0'; diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index e9a4119ac7e..46cf822b08d 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -227,9 +227,9 @@ Panel *uiBeginPanel(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, Pan { Panel *patab, *palast, *panext; const char *drawname = CTX_IFACE_(pt->translation_context, pt->label); - char *idname = pt->idname; - char *tabname = pt->idname; - char *hookname = NULL; + const char *idname = pt->idname; + const char *tabname = pt->idname; + const char *hookname = NULL; const bool newpanel = (pa == NULL); int align = panel_aligned(sa, ar); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 3b180078e5f..3299b7b1312 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1643,7 +1643,7 @@ static void ui_warp_pointer(int x, int y) void ui_set_but_hsv(uiBut *but) { float col[3]; - float *hsv = ui_block_hsv_get(but->block); + const float *hsv = ui_block_hsv_get(but->block); ui_color_picker_to_rgb_v(hsv, col); @@ -1755,7 +1755,7 @@ static void do_color_wheel_rna_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(a uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; float rgb[3]; - float *hsv = ui_block_hsv_get(but->block); + const float *hsv = ui_block_hsv_get(but->block); bool use_display_colorspace = ui_color_picker_use_display_colorspace(but); ui_color_picker_to_rgb_v(hsv, rgb); @@ -2088,7 +2088,7 @@ static unsigned int ui_popup_string_hash(const char *str) { /* sometimes button contains hotkey, sometimes not, strip for proper compare */ int hash; - char *delimit = strchr(str, UI_SEP_CHAR); + const char *delimit = strchr(str, UI_SEP_CHAR); if (delimit) { hash = BLI_ghashutil_strhash_n(str, delimit - str); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 4b18898b17f..4d2bd186f56 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -921,7 +921,7 @@ static void widget_draw_icon(const uiBut *but, BIFIconID icon, float alpha, cons static void ui_text_clip_give_prev_off(uiBut *but) { - char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, but->drawstr + but->ofs); + const char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, but->drawstr + but->ofs); int bytes = but->drawstr + but->ofs - prev_utf8; but->ofs -= bytes; @@ -929,7 +929,7 @@ static void ui_text_clip_give_prev_off(uiBut *but) static void ui_text_clip_give_next_off(uiBut *but) { - char *next_utf8 = BLI_str_find_next_char_utf8(but->drawstr + but->ofs, NULL); + const char *next_utf8 = BLI_str_find_next_char_utf8(but->drawstr + but->ofs, NULL); int bytes = next_utf8 - (but->drawstr + but->ofs); but->ofs += bytes; @@ -1138,7 +1138,7 @@ static void ui_text_clip_right_label(uiFontStyle *fstyle, uiBut *but, const rcti const int okwidth = max_ii(BLI_rcti_size_x(rect) - border, 0); char *cpoin = NULL; int drawstr_len = strlen(but->drawstr); - char *cpend = but->drawstr + drawstr_len; + const char *cpend = but->drawstr + drawstr_len; /* need to set this first */ uiStyleFontSet(fstyle); @@ -1164,7 +1164,7 @@ static void ui_text_clip_right_label(uiFontStyle *fstyle, uiBut *but, const rcti /* chop off the leading text, starting from the right */ while (but->strwidth > okwidth && cp2 > but->drawstr) { - char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, cp2); + const char *prev_utf8 = BLI_str_find_prev_char_utf8(but->drawstr, cp2); int bytes = cp2 - prev_utf8; /* shift the text after and including cp2 back by 1 char, +1 to include null terminator */ @@ -1325,7 +1325,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b if (but->menu_key != '\0') { char fixedbuf[128]; - char *str; + const char *str; BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawstr_left_len)); @@ -2322,7 +2322,7 @@ static void ui_draw_but_HSVCUBE(uiBut *but, const rcti *rect) { float rgb[3]; float x = 0.0f, y = 0.0f; - float *hsv = ui_block_hsv_get(but->block); + const float *hsv = ui_block_hsv_get(but->block); float hsv_n[3]; bool use_display_colorspace = ui_color_picker_use_display_colorspace(but); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 339dd64875f..16550327a5e 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1735,7 +1735,7 @@ void init_userdef_do_versions(void) /* adjust themes */ for (btheme = U.themes.first; btheme; btheme = btheme->next) { - char *col; + const char *col; /* IPO Editor: Handles/Vertices */ col = btheme->tipo.vertex; |