blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 370 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 370 Files Changed 81 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e9763c25e - Show all commits

4
source/blender/windowmanager/intern/wm_operator_type.cc
View File

@ -606,9 +606,9 @@ std::string WM_operatortype_description_or_name(bContext *C,
{ {
std::string text = WM_operatortype_description(C, ot, properties); std::string text = WM_operatortype_description(C, ot, properties);
if (text.empty()) { if (text.empty()) {
const std::string text_orig = WM_operatortype_name(ot, properties); std::string text_orig = WM_operatortype_name(ot, properties);
if (!text_orig.empty()) { if (!text_orig.empty()) {
text = BLI_strdupn(text_orig.c_str(), text_orig.size()); return text_orig;
} }
} }
return text; return text;