Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorMartin Poirier <theeth@yahoo.com>2009-11-10 19:18:54 +0300
committerMartin Poirier <theeth@yahoo.com>2009-11-10 19:18:54 +0300
commitd611dd373558814ea2fc21bcd5418404f1c77a4d (patch)
treed0e0821c73819c44b9bfee71cf0da1d894970f67 /source
parentde7504807cdb6ad7f66695636cb97f0deaf57c09 (diff)
Function declaration for BPY_context_get
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/context.c6
-rw-r--r--source/blender/python/BPY_extern.h3
-rw-r--r--source/blender/python/intern/bpy_interface.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 1cd0e6cd677..21549f6b147 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -46,6 +46,8 @@
#include "BKE_screen.h"
#include "BKE_global.h"
+#include "BPY_extern.h"
+
#include <string.h>
/* struct */
@@ -413,7 +415,9 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
memset(result, 0, sizeof(bContextDataResult));
if(CTX_py_dict_get(C)) {
- return bpy_context_get(C, member, result);
+ return BPY_context_get(C, member, result);
+// if (BPY_context_get(C, member, result))
+// return 1;
}
/* we check recursion to ensure that we do not get infinite
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index acb45790ed2..e73dec097a3 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -49,6 +49,7 @@ struct bConstraintTarget; /* DNA_constraint_types.h*/
struct Script; /* DNA_screen_types.h */
struct BPyMenu;
struct bContext;
+struct bContextDataResult;
struct ReportList;
#ifdef __cplusplus
@@ -104,7 +105,7 @@ extern "C" {
// int BPY_run_script_space_listener(struct bContext *C, struct SpaceScript * sc, struct ARegion *ar, struct wmNotifier *wmn); // 2.5 working
void BPY_update_modules( void ); // XXX - annoying, need this for pointers that get out of date
-
+ int BPY_context_get(struct bContext *C, const char *member, struct bContextDataResult *result);
int BPY_run_script(struct Script *script);
void BPY_free_compiled_text( struct Text *text );
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 4a55c2fb6fb..200e5e52f05 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -966,7 +966,7 @@ int BPY_button_eval(bContext *C, char *expr, double *value)
-int bpy_context_get(bContext *C, const char *member, bContextDataResult *result)
+int BPY_context_get(bContext *C, const char *member, bContextDataResult *result)
{
PyObject *pyctx= (PyObject *)CTX_py_dict_get(C);
PyObject *item= PyDict_GetItemString(pyctx, member);