diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-30 01:23:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-30 01:23:58 +0400 |
| commit | db29fd4cd11994f1afd594a8b26bbbc03dea751f (patch) | |
| tree | f67d018ccff0e21ed6a9da31ba3cc42b8f2ebab0 /source/blender/makesrna/intern/rna_space.c | |
| parent | 6403858ad961935e4b60f044b6fef05eeaaff7d9 (diff) | |
Fix #29393: operator preset compatibility issue due to renaming property to
avoid c++ keyword conflict. Added property back now duplicated, code generator
will avoid the conflict and this should keep things compatible.
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 02eaddaecb6..cbca4dd57b6 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2617,6 +2617,12 @@ static void rna_def_space_filebrowser(BlenderRNA *brna) prop= RNA_def_property(srna, "active_operator", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "op"); RNA_def_property_ui_text(prop, "Active Operator", ""); + + /* keep this for compatibility with existing presets, + not exposed in c++ api because of keyword conflict */ + prop= RNA_def_property(srna, "operator", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "op"); + RNA_def_property_ui_text(prop, "Active Operator", ""); } static void rna_def_space_info(BlenderRNA *brna) |