griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Lukas Tönne
2023-10-03 11:40:20 +02:00
parent 818ae7b149 a06403cd3b
commit e9625b10ab
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/node_tree_anonymous_attributes.cc
View File

@@ -21,7 +21,7 @@ using nodes::NodeDeclaration;
static bool is_possible_field_socket(const eNodeSocketDatatype type)
{
return ELEM(type, SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA, SOCK_BOOLEAN, SOCK_INT);
return ELEM(type, SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA, SOCK_BOOLEAN, SOCK_INT, SOCK_ROTATION);
}
static bool socket_is_field(const bNodeSocket &socket)

17
source/blender/editors/interface/interface_handlers.cc
View File

@@ -10318,12 +10318,14 @@ static int ui_handle_menu_letter_press(
after->opptr = MEM_cnew<PointerRNA>(__func__);
WM_operator_properties_create_ptr(after->opptr, ot);
RNA_string_set(after->opptr, "menu_idname", menu->menu_idname);
const int num_bytes = BLI_str_utf8_size_or_error(event->utf8_buf);
if (num_bytes != -1) {
char buf[sizeof(event->utf8_buf) + 1];
memcpy(buf, event->utf8_buf, num_bytes);
buf[num_bytes] = '\0';
RNA_string_set(after->opptr, "initial_query", buf);
if (event->type != EVT_SPACEKEY) {
const int num_bytes = BLI_str_utf8_size_or_error(event->utf8_buf);
if (num_bytes != -1) {
char buf[sizeof(event->utf8_buf) + 1];
memcpy(buf, event->utf8_buf, num_bytes);
buf[num_bytes] = '\0';
RNA_string_set(after->opptr, "initial_query", buf);
}
}
menu->menuretval = UI_RETURN_OK;
return WM_UI_HANDLER_BREAK;
@@ -10774,7 +10776,8 @@ static int ui_handle_menu_event(bContext *C,
case EVT_WKEY:
case EVT_XKEY:
case EVT_YKEY:
case EVT_ZKEY: {
case EVT_ZKEY:
case EVT_SPACEKEY: {
if (ELEM(event->val, KM_PRESS, KM_DBL_CLICK) &&
((event->modifier & (KM_SHIFT | KM_CTRL | KM_OSKEY)) == 0) &&
/* Only respond to explicit press to avoid the event that opened the menu

5
source/blender/io/collada/collada_utils.cpp
View File

@@ -215,6 +215,11 @@ static void bc_add_armature_collections(COLLADAFW::Node *node,
ExtraTags *node_extra_tags,
bArmature *arm)
{
if (!node_extra_tags) {
/* No 'extra' tags means that there are no bone collections. */
return;
}
std::vector<std::string> collection_names = node_extra_tags->dataSplitString("collections");
std::vector<std::string> visible_names = node_extra_tags->dataSplitString("visible_collections");
std::set<std::string> visible_names_set(visible_names.begin(), visible_names.end());