blender/blender
154
488
Fork 724
Code Issues 6.8k Pull Requests 890 Projects 18 Wiki Activity

Fix: Editor related RNA paths incomplete/wrong #125365

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:124527 into main 2024-08-05 16:54:53 +02:00
Conversation 6 Commits 2 Files Changed 5 +122 -43
5 changed files with 122 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_screen.hh
View File

@ -675,6 +675,10 @@ ARegion *BKE_screen_find_main_region_at_xy(const bScreen *screen, int space_type
ScrArea *BKE_screen_find_area_from_space(const bScreen *screen,
const SpaceLink *sl) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL(1, 2);
/**
* \note used to get proper RNA paths for spaces (editors).
*/
std::optional<std::string> BKE_screen_path_from_screen_to_space(const PointerRNA *ptr);
/**
* \note Using this function is generally a last resort, you really want to be
* using the context when you can - campbell

22
source/blender/blenkernel/intern/screen.cc
View File

@ -13,6 +13,8 @@
# include "BLI_winstuff.h"
#endif
#include <fmt/format.h>
#include <cmath>
#include <cstdio>
#include <cstring>
@ -868,6 +870,26 @@ ScrArea *BKE_screen_find_area_from_space(const bScreen *screen, const SpaceLink
return nullptr;
}
std::optional<std::string> BKE_screen_path_from_screen_to_space(const PointerRNA *ptr)
{
if (GS(ptr->owner_id->name) != ID_SCR) {
Julian Eisel commented 2024-07-25 16:49:09 +02:00
Outdated
Review
Copy Link

Let's not do completely unprotected casting of the owner. Would suggest returning an empty value when owner_id is not of type ID_SCR, and add a BLI_assert_unreachable() to find potential errors.

Also, don't use C-style casts, they are unsafe and hide issues. reinterpret_cast should work here.

Let's not do completely unprotected casting of the owner. Would suggest returning an empty value when `owner_id` is not of type `ID_SCR`, and add a `BLI_assert_unreachable()` to find potential errors. Also, don't use C-style casts, they are unsafe and hide issues. `reinterpret_cast` should work here.
BLI_assert_unreachable();
Julian Eisel commented 2024-07-25 16:49:24 +02:00
Outdated
Review
Copy Link

static_cast

`static_cast`
return std::nullopt;
}
bScreen *screen = reinterpret_cast<bScreen *>(ptr->owner_id);
SpaceLink *link = static_cast<SpaceLink *>(ptr->data);
int area_index;
LISTBASE_FOREACH_INDEX (ScrArea *, area, &screen->areabase, area_index) {
const int space_index = BLI_findindex(&area->spacedata, link);
if (space_index != -1) {
return fmt::format("areas[{}].spaces[{}]", area_index, space_index);
}
}
return std::nullopt;
}
ScrArea *BKE_screen_find_big_area(const bScreen *screen, const int spacetype, const short min)
{
ScrArea *big = nullptr;

6
source/blender/makesrna/intern/rna_sequencer.cc
View File

@ -236,6 +236,11 @@ struct SequencesAllIterator {
int index;
};
static std::optional<std::string> rna_SequenceEditor_path(const PointerRNA * /*ptr*/)
{
return "sequence_editor";
}
static void rna_SequenceEditor_sequences_all_begin(CollectionPropertyIterator *iter,
PointerRNA *ptr)
{
@ -2390,6 +2395,7 @@ static void rna_def_editor(BlenderRNA *brna)
};
srna = RNA_def_struct(brna, "SequenceEditor", nullptr);
RNA_def_struct_ui_text(srna, "Sequence Editor", "Sequence editing data for a Scene data-block");
RNA_def_struct_path_func(srna, "rna_SequenceEditor_path");
RNA_def_struct_ui_icon(srna, ICON_SEQUENCE);
RNA_def_struct_sdna(srna, "Editing");

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

@ -536,6 +536,7 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = {
#ifdef RNA_RUNTIME
# include <algorithm>
# include <fmt/format.h>
# include "AS_asset_representation.hh"
@ -1591,9 +1592,10 @@ static PointerRNA rna_SpaceView3D_overlay_get(PointerRNA *ptr)
return rna_pointer_inherit_refine(ptr, &RNA_View3DOverlay, ptr->data);
}
static std::optional<std::string> rna_View3DOverlay_path(const PointerRNA * /*ptr*/)
static std::optional<std::string> rna_View3DOverlay_path(const PointerRNA *ptr)
{
return "overlay";
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format("{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "overlay");
}
/* Space Image Editor */
@ -1603,14 +1605,16 @@ static PointerRNA rna_SpaceImage_overlay_get(PointerRNA *ptr)
return rna_pointer_inherit_refine(ptr, &RNA_SpaceImageOverlay, ptr->data);
}
static std::optional<std::string> rna_SpaceImageOverlay_path(const PointerRNA * /*ptr*/)
static std::optional<std::string> rna_SpaceImageOverlay_path(const PointerRNA *ptr)
{
return "overlay";
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format("{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "overlay");
}
static std::optional<std::string> rna_SpaceUVEditor_path(const PointerRNA * /*ptr*/)
static std::optional<std::string> rna_SpaceUVEditor_path(const PointerRNA *ptr)
{
return "uv_editor";
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format("{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "uv_editor");
}
static PointerRNA rna_SpaceImageEditor_uvedit_get(PointerRNA *ptr)
@ -2487,20 +2491,39 @@ static void rna_Sequencer_view_type_update(Main * /*bmain*/, Scene * /*scene*/,
ED_area_tag_refresh(area);
}
static std::optional<std::string> rna_SpaceSequencerPreviewOverlay_path(const PointerRNA * /*ptr*/)
static PointerRNA rna_SpaceSequenceEditor_preview_overlay_get(PointerRNA *ptr)
{
return "preview_overlay";
return rna_pointer_inherit_refine(ptr, &RNA_SequencerPreviewOverlay, ptr->data);
}
static std::optional<std::string> rna_SpaceSequencerTimelineOverlay_path(
const PointerRNA * /*ptr*/)
static std::optional<std::string> rna_SpaceSequencerPreviewOverlay_path(const PointerRNA *ptr)
{
return "timeline_overlay";
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format(
"{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "preview_overlay");
}
static std::optional<std::string> rna_SpaceSequencerCacheOverlay_path(const PointerRNA * /*ptr*/)
static PointerRNA rna_SpaceSequenceEditor_timeline_overlay_get(PointerRNA *ptr)
{
return "cache_overlay";
return rna_pointer_inherit_refine(ptr, &RNA_SequencerTimelineOverlay, ptr->data);
}
static std::optional<std::string> rna_SpaceSequencerTimelineOverlay_path(const PointerRNA *ptr)
{
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format(
"{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "timeline_overlay");
}
static PointerRNA rna_SpaceSequenceEditor_cache_overlay_get(PointerRNA *ptr)
{
return rna_pointer_inherit_refine(ptr, &RNA_SequencerCacheOverlay, ptr->data);
}
static std::optional<std::string> rna_SpaceSequencerCacheOverlay_path(const PointerRNA *ptr)
{
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format("{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "cache_overlay");
}
static float rna_SpaceSequenceEditor_zoom_percentage_get(PointerRNA *ptr)
@ -2549,9 +2572,10 @@ static bool rna_SpaceNode_supports_previews(PointerRNA *ptr)
return ED_node_supports_preview(static_cast<SpaceNode *>(ptr->data));
}
static std::optional<std::string> rna_SpaceNodeOverlay_path(const PointerRNA * /*ptr*/)
static std::optional<std::string> rna_SpaceNodeOverlay_path(const PointerRNA *ptr)
{
return "overlay";
std::optional<std::string> editor_path = BKE_screen_path_from_screen_to_space(ptr);
return fmt::format("{}{}{}", editor_path.value_or(""), editor_path ? "." : "", "overlay");
}
static void rna_SpaceNodeEditor_node_tree_set(PointerRNA *ptr,
@ -3585,6 +3609,7 @@ static void rna_def_space(BlenderRNA *brna)
srna = RNA_def_struct(brna, "Space", nullptr);
RNA_def_struct_sdna(srna, "SpaceLink");
RNA_def_struct_ui_text(srna, "Space", "Space data for a screen area");
RNA_def_struct_path_func(srna, "BKE_screen_path_from_screen_to_space");
RNA_def_struct_refine_func(srna, "rna_Space_refine");
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
@ -5822,40 +5847,43 @@ static void rna_def_space_sequencer_preview_overlay(BlenderRNA *brna)
PropertyRNA *prop;
srna = RNA_def_struct(brna, "SequencerPreviewOverlay", nullptr);
RNA_def_struct_sdna(srna, "SequencerPreviewOverlay");
RNA_def_struct_sdna(srna, "SpaceSeq");
RNA_def_struct_nested(brna, srna, "SpaceSequenceEditor");
RNA_def_struct_path_func(srna, "rna_SpaceSequencerPreviewOverlay_path");
RNA_def_struct_ui_text(srna, "Preview Overlay Settings", "");
prop = RNA_def_property(srna, "show_safe_areas", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_PREVIEW_SHOW_SAFE_MARGINS);
RNA_def_property_boolean_sdna(
prop, nullptr, "preview_overlay.flag", SEQ_PREVIEW_SHOW_SAFE_MARGINS);
RNA_def_property_ui_text(
prop, "Safe Areas", "Show TV title safe and action safe areas in preview");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_safe_center", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_PREVIEW_SHOW_SAFE_CENTER);
RNA_def_property_boolean_sdna(
prop, nullptr, "preview_overlay.flag", SEQ_PREVIEW_SHOW_SAFE_CENTER);
RNA_def_property_ui_text(
prop, "Center-Cut Safe Areas", "Show safe areas to fit content in a different aspect ratio");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_metadata", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_PREVIEW_SHOW_METADATA);
RNA_def_property_boolean_sdna(prop, nullptr, "preview_overlay.flag", SEQ_PREVIEW_SHOW_METADATA);
RNA_def_property_ui_text(prop, "Show Metadata", "Show metadata of first visible strip");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_annotation", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_PREVIEW_SHOW_GPENCIL);
RNA_def_property_boolean_sdna(prop, nullptr, "preview_overlay.flag", SEQ_PREVIEW_SHOW_GPENCIL);
RNA_def_property_ui_text(prop, "Show Annotation", "Show annotations for this view");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_image_outline", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_PREVIEW_SHOW_OUTLINE_SELECTED);
RNA_def_property_boolean_sdna(
prop, nullptr, "preview_overlay.flag", SEQ_PREVIEW_SHOW_OUTLINE_SELECTED);
RNA_def_property_ui_text(prop, "Image Outline", "");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_cursor", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_PREVIEW_SHOW_2D_CURSOR);
RNA_def_property_boolean_sdna(prop, nullptr, "preview_overlay.flag", SEQ_PREVIEW_SHOW_2D_CURSOR);
RNA_def_property_ui_text(prop, "2D Cursor", "");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
}
@ -5866,7 +5894,7 @@ static void rna_def_space_sequencer_timeline_overlay(BlenderRNA *brna)
PropertyRNA *prop;
srna = RNA_def_struct(brna, "SequencerTimelineOverlay", nullptr);
RNA_def_struct_sdna(srna, "SequencerTimelineOverlay");
RNA_def_struct_sdna(srna, "SpaceSeq");
RNA_def_struct_nested(brna, srna, "SpaceSequenceEditor");
RNA_def_struct_path_func(srna, "rna_SpaceSequencerTimelineOverlay_path");
RNA_def_struct_ui_text(srna, "Timeline Overlay Settings", "");
@ -5887,7 +5915,7 @@ static void rna_def_space_sequencer_timeline_overlay(BlenderRNA *brna)
};
prop = RNA_def_property(srna, "waveform_display_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "flag");
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "timeline_overlay.flag");
RNA_def_property_enum_items(prop, waveform_type_display_items);
RNA_def_property_ui_text(prop, "Waveform Display", "How Waveforms are displayed");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
@ -5903,55 +5931,62 @@ static void rna_def_space_sequencer_timeline_overlay(BlenderRNA *brna)
};
prop = RNA_def_property(srna, "waveform_display_style", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "flag");
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "timeline_overlay.flag");
RNA_def_property_enum_items(prop, waveform_style_display_items);
RNA_def_property_ui_text(prop, "Waveform Style", "How Waveforms are displayed");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_fcurves", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_FCURVES);
RNA_def_property_boolean_sdna(prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_FCURVES);
RNA_def_property_ui_text(prop, "Show F-Curves", "Display strip opacity/volume curve");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_strip_name", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_STRIP_NAME);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_NAME);
RNA_def_property_ui_text(prop, "Show Name", "");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_strip_source", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_STRIP_SOURCE);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_SOURCE);
RNA_def_property_ui_text(
prop, "Show Source", "Display path to source file, or name of source datablock");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_strip_duration", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_STRIP_DURATION);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_DURATION);
RNA_def_property_ui_text(prop, "Show Duration", "");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_grid", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_GRID);
RNA_def_property_boolean_sdna(prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_GRID);
RNA_def_property_ui_text(prop, "Show Grid", "Show vertical grid lines");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_strip_offset", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_STRIP_OFFSETS);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_OFFSETS);
RNA_def_property_ui_text(prop, "Show Offsets", "Display strip in/out offsets");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_thumbnails", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_THUMBNAILS);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_THUMBNAILS);
RNA_def_property_ui_text(prop, "Show Thumbnails", "Show strip thumbnails");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_strip_tag_color", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_STRIP_COLOR_TAG);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_COLOR_TAG);
RNA_def_property_ui_text(
prop, "Show Color Tags", "Display the strip color tags in the sequencer");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_strip_retiming", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_TIMELINE_SHOW_STRIP_RETIMING);
RNA_def_property_boolean_sdna(
prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_RETIMING);
RNA_def_property_ui_text(prop, "Show Retiming Keys", "Display retiming keys on top of strips");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
}
@ -5962,33 +5997,33 @@ static void rna_def_space_sequencer_cache_overlay(BlenderRNA *brna)
PropertyRNA *prop;
srna = RNA_def_struct(brna, "SequencerCacheOverlay", nullptr);
RNA_def_struct_sdna(srna, "SequencerCacheOverlay");
RNA_def_struct_sdna(srna, "SpaceSeq");
RNA_def_struct_nested(brna, srna, "SpaceSequenceEditor");
RNA_def_struct_path_func(srna, "rna_SpaceSequencerCacheOverlay_path");
RNA_def_struct_ui_text(srna, "Cache Overlay Settings", "");
prop = RNA_def_property(srna, "show_cache", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_CACHE_SHOW);
RNA_def_property_boolean_sdna(prop, nullptr, "cache_overlay.flag", SEQ_CACHE_SHOW);
RNA_def_property_ui_text(prop, "Show Cache", "Visualize cached images on the timeline");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_cache_final_out", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_CACHE_SHOW_FINAL_OUT);
RNA_def_property_boolean_sdna(prop, nullptr, "cache_overlay.flag", SEQ_CACHE_SHOW_FINAL_OUT);
RNA_def_property_ui_text(prop, "Final Images", "Visualize cached complete frames");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_cache_raw", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_CACHE_SHOW_RAW);
RNA_def_property_boolean_sdna(prop, nullptr, "cache_overlay.flag", SEQ_CACHE_SHOW_RAW);
RNA_def_property_ui_text(prop, "Raw Images", "Visualize cached raw images");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_cache_preprocessed", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_CACHE_SHOW_PREPROCESSED);
RNA_def_property_boolean_sdna(prop, nullptr, "cache_overlay.flag", SEQ_CACHE_SHOW_PREPROCESSED);
RNA_def_property_ui_text(prop, "Preprocessed Images", "Visualize cached pre-processed images");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, nullptr);
prop = RNA_def_property(srna, "show_cache_composite", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", SEQ_CACHE_SHOW_COMPOSITE);
RNA_def_property_boolean_sdna(prop, nullptr, "cache_overlay.flag", SEQ_CACHE_SHOW_COMPOSITE);
RNA_def_property_ui_text(prop, "Composite Images", "Visualize cached composite images");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, nullptr);
}
@ -6190,19 +6225,22 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
prop = RNA_def_property(srna, "preview_overlay", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_struct_type(prop, "SequencerPreviewOverlay");
RNA_def_property_pointer_sdna(prop, nullptr, "preview_overlay");
RNA_def_property_pointer_funcs(
prop, "rna_SpaceSequenceEditor_preview_overlay_get", nullptr, nullptr, nullptr);
RNA_def_property_ui_text(prop, "Preview Overlay Settings", "Settings for display of overlays");
prop = RNA_def_property(srna, "timeline_overlay", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_struct_type(prop, "SequencerTimelineOverlay");
RNA_def_property_pointer_sdna(prop, nullptr, "timeline_overlay");
RNA_def_property_pointer_funcs(
prop, "rna_SpaceSequenceEditor_timeline_overlay_get", nullptr, nullptr, nullptr);
RNA_def_property_ui_text(prop, "Timeline Overlay Settings", "Settings for display of overlays");
prop = RNA_def_property(srna, "cache_overlay", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_struct_type(prop, "SequencerCacheOverlay");
RNA_def_property_pointer_sdna(prop, nullptr, "cache_overlay");
RNA_def_property_pointer_funcs(
prop, "rna_SpaceSequenceEditor_cache_overlay_get", nullptr, nullptr, nullptr);
RNA_def_property_ui_text(prop, "Cache Overlay Settings", "Settings for display of overlays");
rna_def_space_sequencer_preview_overlay(brna);
rna_def_space_sequencer_timeline_overlay(brna);

9
source/blender/windowmanager/intern/wm_operators.cc
View File

@ -610,6 +610,15 @@ static const char *wm_context_member_from_ptr(const bContext *C,
TEST_PTR_DATA_TYPE("space_data.overlay", RNA_SpaceNodeOverlay, ptr, snode);
break;
}
case SPACE_SEQ: {
const SpaceSeq *sseq = (SpaceSeq *)space_data;
TEST_PTR_DATA_TYPE(
"space_data.preview_overlay", RNA_SequencerPreviewOverlay, ptr, sseq);
TEST_PTR_DATA_TYPE(
"space_data.timeline_overlay", RNA_SequencerTimelineOverlay, ptr, sseq);
TEST_PTR_DATA_TYPE("space_data.cache_overlay", RNA_SequencerCacheOverlay, ptr, sseq);
break;
}
}
}