diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-18 10:38:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-18 10:50:18 +0300 |
commit | acd98599ffe4197e32586d6beb807638395d3e31 (patch) | |
tree | 7773e90103618664662aad7a02e0b6b421a41d58 /source/blender/makesrna | |
parent | 382e7ce9ecfbdc80853a250a57c0d8f25cf258fa (diff) |
Fix T65397: Assigning shortcut to editor properties gives errors
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 12 |
4 files changed, 26 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index cefc5aded7c..24e604179f2 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -266,6 +266,7 @@ extern StructRNA RNA_FreestyleLineStyle; extern StructRNA RNA_FreestyleModuleSettings; extern StructRNA RNA_FreestyleSettings; extern StructRNA RNA_Function; +extern StructRNA RNA_GPUFXSettings; extern StructRNA RNA_GPencilFrame; extern StructRNA RNA_GPencilInterpolateSettings; extern StructRNA RNA_GPencilLayer; @@ -392,7 +393,6 @@ extern StructRNA RNA_Mesh; extern StructRNA RNA_MeshCacheModifier; extern StructRNA RNA_MeshColor; extern StructRNA RNA_MeshColorLayer; -extern StructRNA RNA_MeshLoopColor; extern StructRNA RNA_MeshDeformModifier; extern StructRNA RNA_MeshEdge; extern StructRNA RNA_MeshFloatProperty; @@ -400,6 +400,7 @@ extern StructRNA RNA_MeshFloatPropertyLayer; extern StructRNA RNA_MeshIntProperty; extern StructRNA RNA_MeshIntPropertyLayer; extern StructRNA RNA_MeshLoop; +extern StructRNA RNA_MeshLoopColor; extern StructRNA RNA_MeshLoopColorLayer; extern StructRNA RNA_MeshLoopTriangle; extern StructRNA RNA_MeshPolygon; diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 24f8d5c4e3d..6eaf303ce2d 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -306,6 +306,11 @@ bool rna_Action_actedit_assign_poll(PointerRNA *ptr, PointerRNA value) return 0; } +static char *rna_DopeSheet_path(PointerRNA *UNUSED(ptr)) +{ + return BLI_strdup("dopesheet"); +} + #else static void rna_def_dopesheet(BlenderRNA *brna) @@ -315,6 +320,7 @@ static void rna_def_dopesheet(BlenderRNA *brna) srna = RNA_def_struct(brna, "DopeSheet", NULL); RNA_def_struct_sdna(srna, "bDopeSheet"); + RNA_def_struct_path_func(srna, "rna_DopeSheet_path"); RNA_def_struct_ui_text( srna, "Dope Sheet", "Settings for filtering the channels shown in animation editors"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ef97b184491..9e2d2cd9c4b 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2492,6 +2492,11 @@ static char *rna_UnitSettings_path(PointerRNA *UNUSED(ptr)) return BLI_strdup("unit_settings"); } +static char *rna_GPUFXSettings_path(PointerRNA *UNUSED(ptr)) +{ + return BLI_strdup("fx_settings"); +} + #else /* Grease Pencil Interpolation tool settings */ @@ -4848,6 +4853,7 @@ static void rna_def_gpu_fx(BlenderRNA *brna) rna_def_gpu_ssao_fx(brna); srna = RNA_def_struct(brna, "GPUFXSettings", NULL); + RNA_def_struct_path_func(srna, "rna_GPUFXSettings_path"); RNA_def_struct_ui_text(srna, "GPU FX Settings", "Settings for GPU based compositing"); prop = RNA_def_property(srna, "ssao", PROP_POINTER, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 01532d8568b..91ef7ad6fae 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1274,6 +1274,11 @@ static char *rna_View3DOverlay_path(PointerRNA *UNUSED(ptr)) /* Space Image Editor */ +static char *rna_SpaceUVEditor_path(PointerRNA *UNUSED(ptr)) +{ + return BLI_strdup("uv_editor"); +} + static PointerRNA rna_SpaceImageEditor_uvedit_get(PointerRNA *ptr) { return rna_pointer_inherit_refine(ptr, &RNA_SpaceUVEditor, ptr->data); @@ -2182,6 +2187,11 @@ static void rna_SpaceClipEditor_view_type_update(Main *UNUSED(bmain), /* File browser. */ +static char *rna_FileSelectParams_path(PointerRNA *UNUSED(ptr)) +{ + return BLI_strdup("params"); +} + int rna_FileSelectParams_filename_editable(struct PointerRNA *ptr, const char **r_info) { FileSelectParams *params = ptr->data; @@ -2696,6 +2706,7 @@ static void rna_def_space_image_uv(BlenderRNA *brna) srna = RNA_def_struct(brna, "SpaceUVEditor", NULL); RNA_def_struct_sdna(srna, "SpaceImage"); RNA_def_struct_nested(brna, srna, "SpaceImageEditor"); + RNA_def_struct_path_func(srna, "rna_SpaceUVEditor_path"); RNA_def_struct_ui_text(srna, "Space UV Editor", "UV editor data for the image editor space"); /* selection */ @@ -5325,6 +5336,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "FileSelectParams", NULL); + RNA_def_struct_path_func(srna, "rna_FileSelectParams_path"); RNA_def_struct_ui_text(srna, "File Select Parameters", "File Select Parameters"); prop = RNA_def_property(srna, "title", PROP_STRING, PROP_NONE); |