blender/blender
150
479
Fork 710
Code Issues 6.8k Pull Requests 897 Projects 18 Wiki Activity

Refactor: change light linking object storage be dynamically allocated #108090

Closed
Brecht Van Lommel wants to merge 128 commits from light-linking-dna into cycles-light-linking
pull from: light-linking-dna
merge into: blender:cycles-light-linking

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

4
source/blender/editors/animation/fmodifier_ui.c
View File

@ -397,8 +397,8 @@ static void generator_panel_draw(const bContext *C, Panel *panel)
uiLayoutColumn(split, false); uiLayoutColumn(split, false);
uiLayout *title_col = uiLayoutColumn(split, false); uiLayout *title_col = uiLayoutColumn(split, false);
uiLayout *title_row = uiLayoutRow(title_col, true); uiLayout *title_row = uiLayoutRow(title_col, true);
uiItemL(title_row, IFACE_("A"), ICON_NONE); uiItemL(title_row, CTX_IFACE_(BLT_I18NCONTEXT_ID_ACTION, "A"), ICON_NONE);
uiItemL(title_row, IFACE_("B"), ICON_NONE); uiItemL(title_row, CTX_IFACE_(BLT_I18NCONTEXT_ID_ACTION, "B"), ICON_NONE);
} }
uiLayout *first_row = uiLayoutRow(col, true); uiLayout *first_row = uiLayoutRow(col, true);

24
source/blender/nodes/function/nodes/node_fn_compare.cc
View File

@ -7,6 +7,8 @@
#include "BLI_string.h" #include "BLI_string.h"
#include "BLI_string_utf8.h" #include "BLI_string_utf8.h"
#include "BLT_translation.h"
#include "UI_interface.h" #include "UI_interface.h"
#include "UI_resources.h" #include "UI_resources.h"
@ -23,20 +25,22 @@ NODE_STORAGE_FUNCS(NodeFunctionCompare)
static void node_declare(NodeDeclarationBuilder &b) static void node_declare(NodeDeclarationBuilder &b)
{ {
b.is_function_node(); b.is_function_node();
b.add_input<decl::Float>("A").min(-10000.0f).max(10000.0f); b.add_input<decl::Float>("A").min(-10000.0f).max(10000.0f).translation_context(
b.add_input<decl::Float>("B").min(-10000.0f).max(10000.0f); BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Float>("B").min(-10000.0f).max(10000.0f).translation_context(
BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Int>("A", "A_INT"); b.add_input<decl::Int>("A", "A_INT").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Int>("B", "B_INT"); b.add_input<decl::Int>("B", "B_INT").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Vector>("A", "A_VEC3"); b.add_input<decl::Vector>("A", "A_VEC3").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Vector>("B", "B_VEC3"); b.add_input<decl::Vector>("B", "B_VEC3").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Color>("A", "A_COL"); b.add_input<decl::Color>("A", "A_COL").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Color>("B", "B_COL"); b.add_input<decl::Color>("B", "B_COL").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::String>("A", "A_STR"); b.add_input<decl::String>("A", "A_STR").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::String>("B", "B_STR"); b.add_input<decl::String>("B", "B_STR").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Float>("C").default_value(0.9f); b.add_input<decl::Float>("C").default_value(0.9f);
b.add_input<decl::Float>("Angle").default_value(0.0872665f).subtype(PROP_ANGLE); b.add_input<decl::Float>("Angle").default_value(0.0872665f).subtype(PROP_ANGLE);