From 6c2750a6fe849ee6d7af763e62937ab5db37ed20 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 16 Dec 2008 16:32:48 +0000
Subject: [PATCH] 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.

---
 source/blender/makesrna/intern/rna_rna.c     |  1 +
 source/blender/python/intern/bpy_interface.c |  3 +++
 source/blender/python/intern/bpy_rna.c       | 14 ++++++++++++++
 source/blender/python/intern/bpy_rna.h       |  1 +
 4 files changed, 19 insertions(+)

diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index d86ab720b90..c69fb968d18 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -436,6 +436,7 @@ static void rna_def_property(BlenderRNA *brna)
 		{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", ""},
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 8ae7dcb5c88..d30809ff39b 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -25,6 +25,9 @@ static PyObject *CreateGlobalDictionary( void )
 	PyDict_SetItemString( dict, "bpy", item );
 	Py_DECREF(item);
 	
+	item = BPY_rna_doc();
+	PyDict_SetItemString( dict, "bpydoc", item );
+	Py_DECREF(item);
 	
 	return dict;
 }
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 0267fa35fd2..356cb40965f 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1145,3 +1145,17 @@ PyObject *BPY_rna_module( void )
 	//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);
+}
+
+
diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h
index 6ceda34268f..94f97a565a4 100644
--- a/source/blender/python/intern/bpy_rna.h
+++ b/source/blender/python/intern/bpy_rna.h
@@ -44,6 +44,7 @@ typedef struct {
 } 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 );