[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40795] trunk/blender/source/blender: rename rna OperatorTypeMacro --> OperatorMacro, since operators types are just called Operator

[Campbell Barton]

Revision: 40795
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40795
Author:   campbellbarton
Date:     2011-10-05 00:19:33 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
rename rna OperatorTypeMacro --> OperatorMacro, since operators types are just called Operator

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/RNA_access.h
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/python/intern/bpy_operator_wrap.c

Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h	2011-10-04 23:46:40 UTC (rev 40794)
+++ trunk/blender/source/blender/makesrna/RNA_access.h	2011-10-05 00:19:33 UTC (rev 40795)
@@ -350,7 +350,7 @@
 extern StructRNA RNA_OperatorMousePath;
 extern StructRNA RNA_OperatorProperties;
 extern StructRNA RNA_OperatorStrokeElement;
-extern StructRNA RNA_OperatorTypeMacro;
+extern StructRNA RNA_OperatorMacro;
 extern StructRNA RNA_OrController;
 extern StructRNA RNA_OutflowFluidSettings;
 extern StructRNA RNA_PackedFile;

Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c	2011-10-04 23:46:40 UTC (rev 40794)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c	2011-10-05 00:19:33 UTC (rev 40795)
@@ -451,7 +451,7 @@
 	return rna_pointer_inherit_refine(ptr, op->type->srna, op->properties);
 }
 
-static PointerRNA rna_OperatorTypeMacro_properties_get(PointerRNA *ptr)
+static PointerRNA rna_OperatorMacro_properties_get(PointerRNA *ptr)
 {
 	wmOperatorTypeMacro *otmacro= (wmOperatorTypeMacro*)ptr->data;
 	wmOperatorType *ot = WM_operatortype_find(otmacro->idname, TRUE);
@@ -1277,8 +1277,8 @@
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	srna= RNA_def_struct(brna, "OperatorTypeMacro", NULL);
-	RNA_def_struct_ui_text(srna, "OperatorTypeMacro", "Storage of a sub operator in a macro after it has been added");
+	srna= RNA_def_struct(brna, "OperatorMacro", NULL);
+	RNA_def_struct_ui_text(srna, "Operator Macro", "Storage of a sub operator in a macro after it has been added");
 	RNA_def_struct_sdna(srna, "wmOperatorTypeMacro");
 
 //	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
@@ -1291,7 +1291,7 @@
 	RNA_def_property_flag(prop, PROP_NEVER_NULL);
 	RNA_def_property_struct_type(prop, "OperatorProperties");
 	RNA_def_property_ui_text(prop, "Properties", "");
-	RNA_def_property_pointer_funcs(prop, "rna_OperatorTypeMacro_properties_get", NULL, NULL, NULL);
+	RNA_def_property_pointer_funcs(prop, "rna_OperatorMacro_properties_get", NULL, NULL, NULL);
 }
 
 static void rna_def_operator_utils(BlenderRNA *brna)

Modified: trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_operator_wrap.c	2011-10-04 23:46:40 UTC (rev 40794)
+++ trunk/blender/source/blender/python/intern/bpy_operator_wrap.c	2011-10-05 00:19:33 UTC (rev 40795)
@@ -125,7 +125,7 @@
 
 	otmacro= WM_operatortype_macro_define(ot, opname);
 
-	RNA_pointer_create(NULL, &RNA_OperatorTypeMacro, otmacro, &ptr_otmacro);
+	RNA_pointer_create(NULL, &RNA_OperatorMacro, otmacro, &ptr_otmacro);
 
 	return pyrna_struct_CreatePyObject(&ptr_otmacro);
 }