diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-25 04:55:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-25 04:55:00 +0300 |
commit | b5100196021d12129c0d7e80be7e202c319ea120 (patch) | |
tree | 4dbd5168c42ed7412df3adfc5114a0f1c52ea2ed /source | |
parent | fcc5b5c48c127b0b4567434e8ce5c30dc91ae1e3 (diff) |
fix for incorrect prints with RNA errors (own fault, CONTAINER_RNA_ID was incorrect) & close keymap file after running.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_internal_types.h | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index ce7ee030906..eb1beb90567 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -346,6 +346,6 @@ struct BlenderRNA { ListBase structs; }; -#define CONTAINER_RNA_ID(cont) (const char *)(((ContainerRNA *)(cont))+1) +#define CONTAINER_RNA_ID(cont) (*(const char **)(((ContainerRNA *)(cont))+1)) #endif /* RNA_INTERNAL_TYPES_H */ diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index fb598c1ac30..8833079d742 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -235,7 +235,7 @@ void BPY_python_start(int argc, const char **argv) utf8towchar(bprogname_wchar, bprogname); Py_SetProgramName(bprogname_wchar); - /* builtin modules */ + /* must run before python initializes */ PyImport_ExtendInittab(bpy_internal_modules); bpy_python_start_path(); /* allow to use our own included python */ @@ -264,7 +264,8 @@ void BPY_python_start(int argc, const char **argv) #else (void)argc; (void)argv; - + + /* must run before python initializes */ PyImport_ExtendInittab(bpy_internal_modules); #endif |