blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 358 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 358 Files Changed 123 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09871cec4e - Show all commits

8
source/blender/editors/interface/interface.cc
View File

@ -6577,7 +6577,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...)
va_start(args, but);
while ((si = (uiStringInfo *)va_arg(args, void *))) {
uiStringInfoType type = si->type;
std::string tmp;
std::optional<std::string> tmp;
if (type == BUT_GET_TIP_LABEL) {
if (but->tip_label_func) {
@ -6679,7 +6679,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...)
}
}
if (tmp.empty()) {
if (!tmp) {
wmOperatorType *ot = UI_but_operatortype_get_from_enum_menu(but, nullptr);
if (ot) {
if (type == BUT_GET_RNA_LABEL) {
@ -6691,7 +6691,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...)
}
}
if (tmp.empty()) {
if (!tmp) {
PanelType *pt = UI_but_paneltype_get(but);
if (pt) {
if (type == BUT_GET_RNA_LABEL) {
@ -6804,7 +6804,7 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...)
}
}
si->strinfo = BLI_strdupn(tmp.c_str(), tmp.size());
si->strinfo = tmp ? BLI_strdupn(tmp->c_str(), tmp->size()) : nullptr;
}
va_end(args);