UI: Add an option to display the node editor context path
Since we have the overlays popover, it makes sense to allow toggling the context path like in the 3D viewport. This commit adds a property, and turns it on by default in existing files. Differential Revision: https://developer.blender.org/D13248
This commit is contained in:
parent
2b6c01d98c
commit
70a7685d04
|
@ -719,6 +719,7 @@ class NODE_PT_overlay(Panel):
|
|||
|
||||
col.separator()
|
||||
|
||||
col.prop(overlay, "show_context_path", text="Context Path")
|
||||
col.prop(snode, "show_annotation", text="Annotations")
|
||||
|
||||
if snode.tree_type == 'GeometryNodeTree':
|
||||
|
|
|
@ -39,7 +39,7 @@ extern "C" {
|
|||
|
||||
/* Blender file format version. */
|
||||
#define BLENDER_FILE_VERSION BLENDER_VERSION
|
||||
#define BLENDER_FILE_SUBVERSION 3
|
||||
#define BLENDER_FILE_SUBVERSION 4
|
||||
|
||||
/* Minimum Blender version that supports reading file written with the current
|
||||
* version. Older Blender versions will test this and show a warning if the file
|
||||
|
|
|
@ -2394,16 +2394,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
|||
FOREACH_MAIN_ID_END;
|
||||
}
|
||||
|
||||
/**
|
||||
* Versioning code until next subversion bump goes here.
|
||||
*
|
||||
* \note Be sure to check when bumping the version:
|
||||
* - "versioning_userdef.c", #blo_do_versions_userdef
|
||||
* - "versioning_userdef.c", #do_versions_theme
|
||||
*
|
||||
* \note Keep this message at the bottom of the function.
|
||||
*/
|
||||
{
|
||||
if (!MAIN_VERSION_ATLEAST(bmain, 301, 4)) {
|
||||
LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
|
||||
if (ntree->type != NTREE_GEOMETRY) {
|
||||
continue;
|
||||
|
@ -2430,6 +2421,29 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
|||
}
|
||||
}
|
||||
|
||||
/* Add a toggle for the breadcrumbs overlay in the node editor. */
|
||||
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
|
||||
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
||||
LISTBASE_FOREACH (SpaceLink *, space, &area->spacedata) {
|
||||
if (space->spacetype == SPACE_NODE) {
|
||||
SpaceNode *snode = (SpaceNode *)space;
|
||||
snode->overlay.flag |= SN_OVERLAY_SHOW_PATH;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Versioning code until next subversion bump goes here.
|
||||
*
|
||||
* \note Be sure to check when bumping the version:
|
||||
* - "versioning_userdef.c", #blo_do_versions_userdef
|
||||
* - "versioning_userdef.c", #do_versions_theme
|
||||
*
|
||||
* \note Keep this message at the bottom of the function.
|
||||
*/
|
||||
{
|
||||
/* Keep this block, even when empty. */
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2650,16 +2650,16 @@ void node_draw_space(const bContext *C, ARegion *region)
|
|||
/* Reset view matrix. */
|
||||
UI_view2d_view_restore(C);
|
||||
|
||||
if (snode->treepath.last) {
|
||||
if (snode->overlay.flag & SN_OVERLAY_SHOW_OVERLAYS && snode->flag & SNODE_SHOW_GPENCIL) {
|
||||
if (snode->overlay.flag & SN_OVERLAY_SHOW_OVERLAYS) {
|
||||
if (snode->flag & SNODE_SHOW_GPENCIL && snode->treepath.last) {
|
||||
/* Draw grease-pencil (screen strokes, and also paint-buffer). */
|
||||
ED_annotation_draw_view2d(C, false);
|
||||
}
|
||||
}
|
||||
|
||||
/* Draw context path. */
|
||||
if (snode->edittree) {
|
||||
draw_tree_path(*C, *region);
|
||||
/* Draw context path. */
|
||||
if (snode->overlay.flag & SN_OVERLAY_SHOW_PATH && snode->edittree) {
|
||||
draw_tree_path(*C, *region);
|
||||
}
|
||||
}
|
||||
|
||||
/* Scrollers. */
|
||||
|
|
|
@ -230,8 +230,8 @@ static SpaceLink *node_create(const ScrArea *UNUSED(area), const Scene *UNUSED(s
|
|||
snode->spacetype = SPACE_NODE;
|
||||
|
||||
snode->flag = SNODE_SHOW_GPENCIL | SNODE_USE_ALPHA;
|
||||
snode->overlay.flag |= SN_OVERLAY_SHOW_OVERLAYS;
|
||||
snode->overlay.flag |= SN_OVERLAY_SHOW_WIRE_COLORS;
|
||||
snode->overlay.flag = (SN_OVERLAY_SHOW_OVERLAYS | SN_OVERLAY_SHOW_WIRE_COLORS |
|
||||
SN_OVERLAY_SHOW_PATH);
|
||||
|
||||
/* backdrop */
|
||||
snode->zoom = 1.0f;
|
||||
|
|
|
@ -1514,6 +1514,7 @@ typedef struct bNodeTreePath {
|
|||
} bNodeTreePath;
|
||||
|
||||
typedef struct SpaceNodeOverlay {
|
||||
/* eSpaceNodeOverlay_Flag */
|
||||
int flag;
|
||||
} SpaceNodeOverlay;
|
||||
|
||||
|
@ -1521,6 +1522,7 @@ typedef enum eSpaceNodeOverlay_Flag {
|
|||
SN_OVERLAY_SHOW_OVERLAYS = (1 << 1),
|
||||
SN_OVERLAY_SHOW_WIRE_COLORS = (1 << 2),
|
||||
SN_OVERLAY_SHOW_TIMINGS = (1 << 3),
|
||||
SN_OVERLAY_SHOW_PATH = (1 << 4),
|
||||
} eSpaceNodeOverlay_Flag;
|
||||
|
||||
typedef struct SpaceNode {
|
||||
|
|
|
@ -7140,6 +7140,12 @@ static void rna_def_space_node_overlay(BlenderRNA *brna)
|
|||
RNA_def_property_boolean_default(prop, false);
|
||||
RNA_def_property_ui_text(prop, "Show Timing", "Display each node's last execution time");
|
||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, NULL);
|
||||
|
||||
prop = RNA_def_property(srna, "show_context_path", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "overlay.flag", SN_OVERLAY_SHOW_PATH);
|
||||
RNA_def_property_boolean_default(prop, true);
|
||||
RNA_def_property_ui_text(prop, "Show Tree Path", "Display breadcrumbs for the editor's context");
|
||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, NULL);
|
||||
}
|
||||
|
||||
static void rna_def_space_node(BlenderRNA *brna)
|
||||
|
|
Loading…
Reference in New Issue