diff options
| -rw-r--r-- | release/scripts/bpymodules/BPyRender.py | 2 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Object.c | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/release/scripts/bpymodules/BPyRender.py b/release/scripts/bpymodules/BPyRender.py index f8622cf82d0..266dbab2e38 100644 --- a/release/scripts/bpymodules/BPyRender.py +++ b/release/scripts/bpymodules/BPyRender.py @@ -33,7 +33,7 @@ def imageFromObjectsOrtho(objects, path, width, height, smooth, alpha= True, cam scn= Scene.GetCurrent() render_scn= Scene.New() render_scn.makeCurrent() - render_scn.Layers |= 2097151 # all layers enabled + render_scn.Layers |= (1<<20)-1 # all layers enabled # Add objects into the current scene for ob in objects: diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c index f26b5dd2b76..9ec0ffa8c00 100644 --- a/source/blender/python/api2_2x/Object.c +++ b/source/blender/python/api2_2x/Object.c @@ -2904,13 +2904,21 @@ static int Object_setDupliGroup( BPy_Object * self, BPy_Group * args ) { Object *ob= self->object; - if( (PyObject *)args == Py_None ) + if( (PyObject *)args == Py_None ) { + if (ob->dup_group) + ob->dup_group->id.us--; + ob->dup_group = NULL; - else if( BPy_Group_Check( args ) ) + } else if( BPy_Group_Check( args ) ) { + if (ob->dup_group) + ob->dup_group->id.us--; + ob->dup_group = args->group; - else + ob->dup_group->id.us++; + } else { return EXPP_ReturnIntError( PyExc_TypeError, "expected a group or None" ); + } return 0; } |