From db29fd4cd11994f1afd594a8b26bbbc03dea751f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 29 Nov 2011 21:23:58 +0000 Subject: [PATCH] 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. --- source/blender/makesrna/intern/rna_space.c | 6 ++++++ 1 file changed, 6 insertions(+) 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)