forked from bartvdbraak/blender
some fixes for building blender as a python module again (wip, more work needed).
This commit is contained in:
parent
f0ce8a563d
commit
c80db5878b
@ -1497,7 +1497,7 @@ PyObject *BPyInit_idprop(void)
|
||||
|
||||
mod = PyModule_Create(&IDProp_module_def);
|
||||
|
||||
/* bmesh.types */
|
||||
/* idprop.types */
|
||||
PyModule_AddObject(mod, "types", (submodule = BPyInit_idprop_types()));
|
||||
PyDict_SetItemString(sys_modules, PyModule_GetName(submodule), submodule);
|
||||
Py_INCREF(submodule);
|
||||
|
@ -158,7 +158,10 @@ extern char build_system[];
|
||||
#endif
|
||||
|
||||
/* Local Function prototypes */
|
||||
#ifndef WITH_PYTHON_MODULE
|
||||
#ifdef WITH_PYTHON_MODULE
|
||||
int main_python_enter(int argc, const char **argv);
|
||||
void main_python_exit(void);
|
||||
#else
|
||||
static int print_help(int argc, const char **argv, void *data);
|
||||
static int print_version(int argc, const char **argv, void *data);
|
||||
#endif
|
||||
@ -173,10 +176,10 @@ static int print_version(int argc, const char **argv, void *data);
|
||||
/* Initialize callbacks for the modules that need them */
|
||||
static void setCallbacks(void);
|
||||
|
||||
static bool use_crash_handler = true;
|
||||
|
||||
#ifndef WITH_PYTHON_MODULE
|
||||
|
||||
static bool use_crash_handler = true;
|
||||
|
||||
/* set breakpoints here when running in debug mode, useful to catch floating point errors */
|
||||
#if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
|
||||
static void fpe_handler(int UNUSED(sig))
|
||||
@ -1469,12 +1472,14 @@ int main(int argc, const char **argv)
|
||||
setupArguments(C, ba, &syshandle);
|
||||
|
||||
BLI_argsParse(ba, 1, NULL, NULL);
|
||||
#endif
|
||||
|
||||
if (use_crash_handler) {
|
||||
/* after parsing args */
|
||||
signal(SIGSEGV, blender_crash_handler);
|
||||
}
|
||||
#else
|
||||
(void)syshandle;
|
||||
#endif
|
||||
|
||||
/* after level 1 args, this is so playanim skips RNA init */
|
||||
RNA_init();
|
||||
@ -1486,7 +1491,6 @@ int main(int argc, const char **argv)
|
||||
|
||||
#if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
|
||||
G.background = true; /* python module mode ALWAYS runs in background mode (for now) */
|
||||
(void)blender_esc;
|
||||
#else
|
||||
/* for all platforms, even windos has it! */
|
||||
if (G.background) {
|
||||
|
Loading…
Reference in New Issue
Block a user