diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-15 22:15:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-15 22:15:51 +0400 |
| commit | e79b244097ae1a416edbd0e28cfd6f07bc2e2daa (patch) | |
| tree | 30367d0995e04e935149ffe2c78eebea0a20bbe3 /source/blender/collada/DocumentImporter.cpp | |
| parent | 3b5fa7bba0206870e5eb832fbcc3692c8437b62b (diff) | |
Fix collada and freestyle module compile errors after recent commit, forgot to
compile with those enabled.
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 144fe75fa70..f8fc035f620 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -266,7 +266,7 @@ void DocumentImporter::finish() Base *base = BKE_scene_base_find(sce, ob); if (base) { BLI_remlink(&sce->base, base); - BKE_libblock_free_us(&G.main->object, base->object); + BKE_libblock_free_us(G.main, base->object); if (sce->basact == base) sce->basact = NULL; MEM_freeN(base); @@ -356,7 +356,7 @@ Object *DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera ob->data = cam; old_cam->id.us--; if (old_cam->id.us == 0) - BKE_libblock_free(&G.main->camera, old_cam); + BKE_libblock_free(G.main, old_cam); return ob; } @@ -374,7 +374,7 @@ Object *DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Sce ob->data = la; old_lamp->id.us--; if (old_lamp->id.us == 0) - BKE_libblock_free(&G.main->lamp, old_lamp); + BKE_libblock_free(G.main, old_lamp); return ob; } |