diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2006-06-26 08:26:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2006-06-26 08:26:51 +0400 |
| commit | d5246c43dea3562bda3f7abac713ad092c844f87 (patch) | |
| tree | 19c0ca1a3a54330fe15cb57436284726073386bb | |
| parent | 1e9ce63b4052f3d02afa713603bdd8dd04431722 (diff) | |
Object_join Was raising exceptions about being in background mode when it wasnt, this seems to fix it. memory corruption is an unlikely resion because its the first check.
| -rw-r--r-- | source/blender/python/api2_2x/Object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c index 6610a232060..1fc2bf8bcb8 100644 --- a/source/blender/python/api2_2x/Object.c +++ b/source/blender/python/api2_2x/Object.c @@ -2025,7 +2025,7 @@ static PyObject *Object_join( BPy_Object * self, PyObject * args ) short type; int i, ok=0, ret_value=0, list_length=0; - if( G.background ) + if( G.background==1 ) return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, "cannot join objects in background mode" ) ); |