blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Nodes: Move preview images to an overlay #108001

Merged
Brecht Van Lommel merged 44 commits from Kdaf/blender:main into main 2023-07-12 16:14:21 +02:00
Conversation 47 Commits 44 Files Changed 10 +4 -12
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8c7e3e97c - Show all commits

16
source/blender/makesrna/intern/rna_space.cc
View File

@ -2502,16 +2502,12 @@ static PointerRNA rna_SpaceNode_overlay_get(PointerRNA *ptr)
return rna_pointer_inherit_refine(ptr, &RNA_SpaceNodeOverlay, ptr->data);
}
<<<<<<< HEAD:source/blender/makesrna/intern/rna_space.cc
static char *rna_SpaceNodeOverlay_path(const PointerRNA * /*ptr*/)
=======
static bool rna_SpaceNode_supports_previews(PointerRNA *ptr)
{
return ED_node_supports_preview((SpaceNode *)ptr->data);
Kdaf marked this conversation as resolved Outdated
Hans Goudey commented 2023-07-10 13:41:54 +02:00
Outdated
Review
Copy Link

static_cast

`static_cast`
}
static char *rna_SpaceNodeOverlay_path(const PointerRNA *UNUSED(ptr))
>>>>>>> 584e584fdb0 (Add preview option from nodeArea options.):source/blender/makesrna/intern/rna_space.c
static char *rna_SpaceNodeOverlay_path(const PointerRNA * /*ptr*/)
{
return BLI_strdup("overlay");
}
@ -7410,18 +7406,14 @@ static void rna_def_space_node_overlay(BlenderRNA *brna)
RNA_def_property_boolean_default(prop, true);
RNA_def_property_ui_text(
prop, "Show Named Attributes", "Show when nodes are using named attributes");
<<<<<<< HEAD:source/blender/makesrna/intern/rna_space.cc
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, nullptr);
=======
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, NULL);
prop = RNA_def_property(srna, "show_previews", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overlay.flag", SN_OVERLAY_SHOW_PREVIEWS);
RNA_def_property_boolean_sdna(prop, nullptr, "overlay.flag", SN_OVERLAY_SHOW_PREVIEWS);
RNA_def_property_boolean_default(prop, false);
RNA_def_property_ui_text(
prop, "Show Node Previews", "Display each node's preview if node is toggled");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, NULL);
>>>>>>> 584e584fdb0 (Add preview option from nodeArea options.):source/blender/makesrna/intern/rna_space.c
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, nullptr);
}
static void rna_def_space_node(BlenderRNA *brna)
@ -7642,7 +7634,7 @@ static void rna_def_space_node(BlenderRNA *brna)
prop, "Overlay Settings", "Settings for display of overlays in the Node Editor");
prop = RNA_def_property(srna, "supports_preview", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_SpaceNode_supports_previews", NULL);
RNA_def_property_boolean_funcs(prop, "rna_SpaceNode_supports_previews", nullptr);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
rna_def_space_node_overlay(brna);