diff options
author | bubnikv <bubnikv@gmail.com> | 2018-11-02 22:53:47 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2018-11-02 22:53:47 +0300 |
commit | 0870f814256d131ff1858f94f4f08aa3bbb97732 (patch) | |
tree | 61c9b8b7e6acf2f60b2b99ef90f3fa4571422f9b /xs | |
parent | 622f4ee4f62474acfa0ee2f3f071bb4839e0532d (diff) | |
parent | 3b72748489b544d95e741f67f971d2fd7c2b8e4d (diff) |
Merge remote-tracking branch 'remotes/origin/vb_modelbase_id_refactor' into dev_native
Diffstat (limited to 'xs')
-rw-r--r-- | xs/xsp/Model.xsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xs/xsp/Model.xsp b/xs/xsp/Model.xsp index 180e052ff..a198b1b9f 100644 --- a/xs/xsp/Model.xsp +++ b/xs/xsp/Model.xsp @@ -32,7 +32,7 @@ %name{_add_object} Ref<ModelObject> add_object(); Ref<ModelObject> _add_object_clone(ModelObject* other, bool copy_volumes = true) - %code%{ RETVAL = THIS->add_object(*other, copy_volumes); %}; + %code%{ auto ptr = THIS->add_object(*other); if (! copy_volumes) ptr->clear_volumes(); RETVAL = ptr; %}; void delete_object(size_t idx); void clear_objects(); size_t objects_count() |