diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:15:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:15:51 +0300 |
| commit | fd19069999e3655206ccf21dc851801a325dea5d (patch) | |
| tree | 54d5d865c13e42ef50829e6358afdf5790d2df74 /source/blender/collada/ControllerExporter.cpp | |
| parent | 66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff) | |
Cleanup: remove last G.main's from Collada code.
Diffstat (limited to 'source/blender/collada/ControllerExporter.cpp')
| -rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index c89e0f1ec62..5673d33fcbf 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -107,8 +107,9 @@ bool ControllerExporter::add_instance_controller(Object *ob) return true; } -void ControllerExporter::export_controllers(Scene *sce) +void ControllerExporter::export_controllers(Main *bmain, Scene *sce) { + m_bmain = bmain; scene = sce; openLibrary(); @@ -200,7 +201,9 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm) bool use_instantiation = this->export_settings->use_object_instantiation; Mesh *me; - me = bc_get_mesh_copy(scene, + me = bc_get_mesh_copy( + m_bmain, + scene, ob, this->export_settings->export_mesh_type, this->export_settings->apply_modifiers, @@ -291,7 +294,7 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm) add_joints_element(&ob->defbase, joints_source_id, inv_bind_mat_source_id); add_vertex_weights_element(weights_source_id, joints_source_id, vcounts, joints); - BKE_libblock_free_us(G.main, me); + BKE_libblock_free_us(m_bmain, me); closeSkin(); closeController(); @@ -302,7 +305,9 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key) bool use_instantiation = this->export_settings->use_object_instantiation; Mesh *me; - me = bc_get_mesh_copy(scene, + me = bc_get_mesh_copy( + m_bmain, + scene, ob, this->export_settings->export_mesh_type, this->export_settings->apply_modifiers, @@ -327,7 +332,7 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key) COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, morph_weights_id))); targets.add(); - BKE_libblock_free_us(G.main, me); + BKE_libblock_free_us(m_bmain, me); //support for animations |