Revision: 17894
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17894
Author: campbellbarton
Date: 2008-12-16 17:32:48 +0100 (Tue, 16 Dec 2008)
Log Message:
-----------
Added "bpydoc" to the global namespace of python scripts, making documentation
available no matter what data is open in the current blend file, Directory type
was also missing from the subtype enum causing the test rna-dump script to fail.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.h
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
2008-12-16 13:49:51 UTC (rev 17893)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
2008-12-16 16:32:48 UTC (rev 17894)
@@ -436,6 +436,7 @@
{PROP_NONE, "NONE", "None", ""},
{PROP_UNSIGNED, "UNSIGNED", "Unsigned Number", ""},
{PROP_FILEPATH, "FILEPATH", "File Path", ""},
+ {PROP_DIRPATH, "DIRPATH", "Directory Path", ""},
{PROP_COLOR, "COLOR", "Color", ""},
{PROP_VECTOR, "VECTOR", "Vector", ""},
{PROP_MATRIX, "MATRIX", "Matrix", ""},
Modified:
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
2008-12-16 13:49:51 UTC (rev 17893)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
2008-12-16 16:32:48 UTC (rev 17894)
@@ -25,6 +25,9 @@
PyDict_SetItemString( dict, "bpy", item );
Py_DECREF(item);
+ item = BPY_rna_doc();
+ PyDict_SetItemString( dict, "bpydoc", item );
+ Py_DECREF(item);
return dict;
}
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2008-12-16 13:49:51 UTC (rev 17893)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2008-12-16 16:32:48 UTC (rev 17894)
@@ -1145,3 +1145,17 @@
//submodule = Py_InitModule3( "rna", M_rna_methods, "rna module" );
return pyrna_struct_CreatePyObject(&ptr);
}
+
+/* This is a way we can access docstrings for RNA types
+ * without having the datatypes in blender */
+PyObject *BPY_rna_doc( void )
+{
+ PointerRNA ptr;
+
+ /* for now, return the base RNA type rather then a real module */
+ RNA_blender_rna_pointer_create(&ptr);
+
+ return pyrna_struct_CreatePyObject(&ptr);
+}
+
+
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.h
2008-12-16 13:49:51 UTC (rev 17893)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.h
2008-12-16 16:32:48 UTC (rev 17894)
@@ -44,6 +44,7 @@
} BPy_PropertyRNA;
PyObject *BPY_rna_module( void );
+PyObject *BPY_rna_doc( void );
PyObject *pyrna_struct_CreatePyObject( PointerRNA *ptr );
PyObject *pyrna_prop_CreatePyObject( PointerRNA *ptr, PropertyRNA *prop );
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
