blender/blender
154
489
Fork 725
Code Issues 6.7k Pull Requests 886 Projects 18 Wiki Activity

Nodes: new interactive operator to slide nodes #121981

Open
Jacques Lucke wants to merge 24 commits from JacquesLucke/blender:slide-nodes into main
pull from: JacquesLucke/blender:slide-nodes
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 27 Commits 24 Files Changed 4 +16 -4
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4801cba0db - Show all commits

2
source/blender/draw/engines/eevee_next/eevee_engine.cc
View File

@ -112,6 +112,8 @@ static void eevee_draw_scene(void *vedata)
STRNCPY(ved->info, ved->instance->info.c_str());
/* Reset view for other following engines. */
DRW_view_set_active(nullptr);
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
GPU_framebuffer_viewport_reset(dfbl->default_fb);
}
static void eevee_cache_init(void *vedata)

18
source/blender/editors/interface/templates/interface_template_node_inputs.cc
View File

@ -43,10 +43,20 @@ static void draw_node_input(bContext *C,
{
BLI_assert(socket.typeinfo != nullptr);
/* Ignore disabled sockets and linked sockets and sockets without a `draw` callback. */
if (!socket.is_available() || (socket.flag & (SOCK_IS_LINKED | SOCK_HIDE_VALUE)) ||
socket.typeinfo->draw == nullptr ||
ELEM(socket.type, SOCK_GEOMETRY, SOCK_MATRIX, SOCK_SHADER))
{
if (!socket.is_available()) {
return;
}
if ((socket.flag & (SOCK_IS_LINKED | SOCK_HIDE_VALUE)) != 0) {
return;
}
if (socket.typeinfo->draw == nullptr) {
return;
}
if (ELEM(socket.type, SOCK_GEOMETRY, SOCK_MATRIX, SOCK_SHADER)) {
return;
}
const bNode &node = *static_cast<bNode *>(node_ptr->data);
if (node.is_reroute()) {
return;
}