Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-01-15 22:15:51 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-01-15 22:15:51 +0400
commite79b244097ae1a416edbd0e28cfd6f07bc2e2daa (patch)
tree30367d0995e04e935149ffe2c78eebea0a20bbe3 /source/blender/collada/ControllerExporter.cpp
parent3b5fa7bba0206870e5eb832fbcc3692c8437b62b (diff)
Fix collada and freestyle module compile errors after recent commit, forgot to
compile with those enabled.
Diffstat (limited to 'source/blender/collada/ControllerExporter.cpp')
-rw-r--r--source/blender/collada/ControllerExporter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp
index 948a3dc5ae1..17ac5478b22 100644
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@ -291,7 +291,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->mesh), me);
+ BKE_libblock_free_us(G.main, me);
closeSkin();
closeController();
@@ -327,7 +327,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->mesh), me);
+ BKE_libblock_free_us(G.main, me);
//support for animations