diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-02-01 00:52:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-01 00:52:26 +0300 |
commit | fd3842f3a2b9f92fabec6268271429200b2713bd (patch) | |
tree | a5c408ce5260de6636b2581abb74a0fcdcd6bf0f /source/blender/python/intern | |
parent | 02c6d160d7332feaed3efd1a6378406966a25bb1 (diff) |
Mathutils doc improvements + other small things
- bpy.app moved into PyStructSequence (used by sys.float_info)
- added buildinfo into bpy.app.build_*
- bpy.ui removed (wasnt used)
- include external example files in Mathutils docs (only Mathutils and Vector are currently written)
- added support to auto document PyStructSequence's
- CMake had "'s inside all its strings.
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 23 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_ui.c | 69 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_ui.h | 31 |
3 files changed, 2 insertions, 121 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index e5204c0b8b5..7074f507aca 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -41,7 +41,6 @@ #include "bpy_rna.h" #include "bpy_props.h" #include "bpy_operator.h" -#include "bpy_ui.h" #include "bpy_util.h" #ifndef WIN32 @@ -60,11 +59,9 @@ #include "BLI_fileops.h" #include "BLI_string.h" -#include "BKE_blender.h" #include "BKE_context.h" #include "BKE_text.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BPY_extern.h" @@ -210,9 +207,7 @@ static void bpy_init_modules( void ) /* PyModule_AddObject( mod, "doc", BPY_rna_doc() ); */ PyModule_AddObject( mod, "props", BPY_rna_props() ); PyModule_AddObject( mod, "ops", BPY_operator_module() ); /* ops is now a python module that does the conversion from SOME_OT_foo -> some.foo */ - PyModule_AddObject( mod, "ui", BPY_ui_module() ); // XXX very experimental, consider this a test, especially PyCObject is not meant to be permanent - - + PyModule_AddObject( mod, "app", BPY_app_struct() ); /* bpy context */ { @@ -224,20 +219,6 @@ static void bpy_init_modules( void ) PyModule_AddObject(mod, "context", (PyObject *)bpy_context_module); } - /* blender info that wont change at runtime, add into _bpy */ - { - extern char bprogname[]; /* argv[0] from creator.c */ - - PyObject *mod_dict= PyModule_GetDict(mod); - char tmpstr[256]; - PyModule_AddStringConstant(mod, "_HOME", BLI_gethome()); - PyDict_SetItemString(mod_dict, "_VERSION", Py_BuildValue("(iii)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION)); - sprintf(tmpstr, "%d.%02d (sub %d)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION); - PyModule_AddStringConstant(mod, "_VERSION_STR", tmpstr); - PyModule_AddStringConstant(mod, "_BINPATH", bprogname); - PyModule_AddIntConstant(mod, "_DEBUG", G.f & G_DEBUG ? 1:0); - } - /* add our own modules dir, this is a python package */ bpy_import_test("bpy"); } @@ -794,7 +775,7 @@ int BPY_context_get(bContext *C, const char *member, bContextDataResult *result) if (item) printf("Context '%s' not a valid type\n", member); else printf("Context '%s' not found\n", member); } - else if (G.f & G_DEBUG) { + else { printf("Context '%s' found\n", member); } diff --git a/source/blender/python/intern/bpy_ui.c b/source/blender/python/intern/bpy_ui.c deleted file mode 100644 index ab50ebd8bd5..00000000000 --- a/source/blender/python/intern/bpy_ui.c +++ /dev/null @@ -1,69 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Contributor(s): Campbell Barton - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#include "bpy_ui.h" -#include "bpy_util.h" -#include "bpy_rna.h" /* for rna buttons */ -#include "bpy_operator.h" /* for setting button operator properties */ - -#include "WM_types.h" /* for WM_OP_INVOKE_DEFAULT & friends */ - -#include "BLI_dynstr.h" - -#include "MEM_guardedalloc.h" -#include "BKE_global.h" /* evil G.* */ -#include "BKE_context.h" - -#include "DNA_screen_types.h" -#include "DNA_space_types.h" /* only for SpaceLink */ -#include "UI_interface.h" -#include "WM_api.h" - -/* Dummy Module, may want to include non RNA UI functions here, else it can be removed */ - -static struct PyMethodDef ui_methods[] = { - {NULL, NULL, 0, NULL} -}; - -static struct PyModuleDef ui_module = { - PyModuleDef_HEAD_INIT, - "_bpy.ui", - "", - -1,/* multiple "initialization" just copies the module dict. */ - ui_methods, - NULL, NULL, NULL, NULL -}; - -PyObject *BPY_ui_module( void ) -{ - PyObject *submodule; - submodule= PyModule_Create(&ui_module); - - /* INCREF since its its assumed that all these functions return the - * module with a new ref like PyDict_New, since they are passed to - * PyModule_AddObject which steals a ref */ - Py_INCREF(submodule); - - return submodule; -} diff --git a/source/blender/python/intern/bpy_ui.h b/source/blender/python/intern/bpy_ui.h deleted file mode 100644 index 4182a32d3f0..00000000000 --- a/source/blender/python/intern/bpy_ui.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Contributor(s): Campbell Barton - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef BPY_UI_H__ -#define BPY_UI_H__ - -#include <Python.h> - -PyObject *BPY_ui_module( void ); - -#endif |