[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42274] trunk/blender/source/blender/ makesrna/intern/rna_space.c: Fix #29393: operator preset compatibility issue due to renaming property to

[Brecht Van Lommel]

Revision: 42274
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42274
Author:   blendix
Date:     2011-11-29 21:23:58 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-11-29 21:13:37 UTC (rev 42273)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-11-29 21:23:58 UTC (rev 42274)
@@ -2617,6 +2617,12 @@
 	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)