diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 11:20:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 11:20:27 +0400 |
commit | d92b5ea04ac8b661bb8caa7a1ca813e8f33a5a1c (patch) | |
tree | 238bc3e3511b6d26c49012e958599a8a883aa842 | |
parent | ea4b3fee1f51db4e6cd53daf8071429991dc95e3 (diff) | |
parent | 1657cbe61a756222feac5107f87d0d699a92b4a6 (diff) |
svn merge ^/trunk/blender -r40390:40394
-rw-r--r-- | GNUmakefile | 17 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.h | 3 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface_atexit.c | 76 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 28 |
8 files changed, 118 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile index 7da60ce951b..d587668cf0c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -36,7 +36,7 @@ OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]') BLENDER_DIR:=$(shell pwd -P) BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE) BUILD_TYPE:=Release -BUILD_CMAKE_ARGS:="" +BUILD_CMAKE_ARGS:= # ----------------------------------------------------------------------------- @@ -77,6 +77,16 @@ ifeq ($(OS), NetBSD) NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 ) endif + +# ----------------------------------------------------------------------------- +# Macro for configuring cmake + +CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \ + -H$(BLENDER_DIR) \ + -B$(BUILD_DIR) \ + -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) + + # ----------------------------------------------------------------------------- # Build Blender all: @@ -84,7 +94,7 @@ all: @echo Configuring Blender ... if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ - cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \ + $(CMAKE_CONFIG); \ fi @echo @@ -186,12 +196,15 @@ project_eclipse: # check_cppcheck: + $(CMAKE_CONFIG) cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py check_splint: + $(CMAKE_CONFIG) cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py check_sparse: + $(CMAKE_CONFIG) cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 60784639436..ed98a179d05 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1816,7 +1816,7 @@ void flushTransParticles(TransInfo *t) /* ********************* mesh ****************** */ /* proportional distance based on connectivity */ -#define THRESHOLD 0.000000000000001f +#define THRESHOLD 0.0001f /*I did this wrong, it should be a breadth-first search but instead it's a depth-first search, fudged diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 9ed08591eea..acdee5328e7 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -47,6 +47,7 @@ set(SRC bpy_app_handlers.c bpy_driver.c bpy_interface.c + bpy_interface_atexit.c bpy_intern_string.c bpy_library.c bpy_operator.c diff --git a/source/blender/python/intern/bpy.h b/source/blender/python/intern/bpy.h index 0ebc6bb2438..6844d6637ed 100644 --- a/source/blender/python/intern/bpy.h +++ b/source/blender/python/intern/bpy.h @@ -28,3 +28,6 @@ void BPy_init_modules(void); extern PyObject *bpy_package_py; + +/* bpy_interface_atexit.c */ +void BPY_atexit_init(void); diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index e5bfc1d633f..87edf9303ef 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -30,7 +30,7 @@ /* grr, python redefines */ #ifdef _POSIX_C_SOURCE -#undef _POSIX_C_SOURCE +# undef _POSIX_C_SOURCE #endif #include <Python.h> @@ -241,6 +241,8 @@ void BPY_python_start(int argc, const char **argv) pyrna_alloc_types(); + BPY_atexit_init(); /* this can init any time */ + #ifndef WITH_PYTHON_MODULE py_tstate= PyGILState_GetThisThreadState(); PyEval_ReleaseThread(py_tstate); diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c new file mode 100644 index 00000000000..0230a3bad90 --- /dev/null +++ b/source/blender/python/intern/bpy_interface_atexit.c @@ -0,0 +1,76 @@ +/* + * $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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/python/intern/bpy_interface_atexit.c + * \ingroup pythonintern + */ + + +#include <Python.h> + +#include "bpy_util.h" + +#include "WM_api.h" + +#include "BLI_utildefines.h" + +static PyObject *bpy_atexit(PyObject *UNUSED(self), PyObject *UNUSED(args), PyObject *UNUSED(kw)) +{ + /* close down enough of blender at least not to crash */ + struct bContext *C= BPy_GetContext(); + + WM_exit_ext(C, 0); + + Py_RETURN_NONE; +} + +static PyMethodDef meth_bpy_atexit= {"bpy_atexit", (PyCFunction)bpy_atexit, METH_NOARGS, NULL}; + +void BPY_atexit_init(void) +{ + /* note - no error checking, if any of these fail we'll get a crash + * this is intended, but if its problematic it could be changed + * - campbell */ + + PyObject *atexit_mod= PyImport_ImportModuleLevel((char *)"atexit", NULL, NULL, NULL, 0); + PyObject *atexit_register= PyObject_GetAttrString(atexit_mod, "register"); + PyObject *args= PyTuple_New(1); + PyObject *ret; + + PyTuple_SET_ITEM(args, 0, (PyObject *)PyCFunction_New(&meth_bpy_atexit, NULL)); + + ret= PyObject_CallObject(atexit_register, args); + + Py_DECREF(atexit_mod); + Py_DECREF(atexit_register); + Py_DECREF(args); + + if(ret) { + Py_DECREF(ret); + } + else { /* should never happen */ + PyErr_Print(); + } + +} diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 5bdf1ec2787..9e19a057175 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -72,6 +72,7 @@ void WM_setinitialstate_fullscreen(void); void WM_setinitialstate_normal(void); void WM_init (struct bContext *C, int argc, const char **argv); +void WM_exit_ext (struct bContext *C, const short do_python); void WM_exit (struct bContext *C); void WM_main (struct bContext *C); diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index fe46ab01ac2..acdf0880144 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -343,7 +343,8 @@ extern void free_fmodifiers_copybuf(void); extern void free_posebuf(void); /* called in creator.c even... tsk, split this! */ -void WM_exit(bContext *C) +/* note, doesnt run exit() call WM_exit() for that */ +void WM_exit_ext(bContext *C, const short do_python) { wmWindow *win; @@ -409,14 +410,17 @@ void WM_exit(bContext *C) #ifdef WITH_PYTHON - /* XXX - old note */ - /* before free_blender so py's gc happens while library still exists */ - /* needed at least for a rare sigsegv that can happen in pydrivers */ - - /* Update for blender 2.5, move after free_blender because blender now holds references to PyObject's - * so decref'ing them after python ends causes bad problems every time - * the pyDriver bug can be fixed if it happens again we can deal with it then */ - BPY_python_end(); + /* option not to close python so we can use 'atexit' */ + if(do_python) { + /* XXX - old note */ + /* before free_blender so py's gc happens while library still exists */ + /* needed at least for a rare sigsegv that can happen in pydrivers */ + + /* Update for blender 2.5, move after free_blender because blender now holds references to PyObject's + * so decref'ing them after python ends causes bad problems every time + * the pyDriver bug can be fixed if it happens again we can deal with it then */ + BPY_python_end(); + } #endif GPU_global_buffer_pool_free(); @@ -463,6 +467,10 @@ void WM_exit(bContext *C) getchar(); } #endif - exit(G.afbreek==1); } +void WM_exit(bContext *C) +{ + WM_exit_ext(C, 1); + exit(G.afbreek==1); +} |