tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.0-release'

This commit is contained in:
Philipp Oeser 2023-10-24 13:14:19 +02:00
parent f2627a55ee a48d4184b5
commit 4ce55752ae
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_template_node_tree_interface.cc
View File

@ -153,6 +153,8 @@ class NodeSocketViewItem : public BasicTreeViewItem {
}
bool rename(const bContext &C, StringRefNull new_name) override
{
MEM_SAFE_FREE(socket_.name);
socket_.name = BLI_strdup(new_name.c_str());
nodetree_.tree_interface.tag_items_changed();
ED_node_tree_propagate_change(&C, CTX_data_main(&C), &nodetree_);
@ -210,6 +212,8 @@ class NodePanelViewItem : public BasicTreeViewItem {
}
bool rename(const bContext &C, StringRefNull new_name) override
{
MEM_SAFE_FREE(panel_.name);
panel_.name = BLI_strdup(new_name.c_str());
nodetree_.tree_interface.tag_items_changed();
ED_node_tree_propagate_change(&C, CTX_data_main(&C), &nodetree_);

4
source/blender/editors/sculpt_paint/sculpt_ops.cc
View File

@ -748,7 +748,7 @@ static void do_mask_by_color_contiguous_update_node(Object *ob,
const float new_mask = mask_by_color_floodfill[vd.index];
const float mask = sculpt_mask_by_color_final_mask_get(
current_mask, new_mask, invert, preserve_mask);
if (current_mask == current_mask) {
if (current_mask == mask) {
continue;
}
@ -861,7 +861,7 @@ static void do_mask_by_color_task(Object *ob,
const float new_mask = sculpt_mask_by_color_delta_get(active_color, col, threshold, invert);
const float mask = sculpt_mask_by_color_final_mask_get(
current_mask, new_mask, invert, preserve_mask);
if (current_mask == vd.mask) {
if (current_mask == mask) {
continue;
}