Fix collada and freestyle module compile errors after recent commit, forgot to

compile with those enabled.

4 files changed, 7 insertions, 7 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
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;
 }
 
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp
index d848db671a1..3d5d79f55ea 100644
--- a/source/blender/collada/GeometryExporter.cpp
+++ b/source/blender/collada/GeometryExporter.cpp
@@ -165,7 +165,7 @@ void GeometryExporter::operator()(Object *ob)
 		}
 	}
 
-	BKE_libblock_free_us(&(G.main->mesh), me);
+	BKE_libblock_free_us(G.main, me);
 
 }
 
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index c7652bd7ae7..fefd24a56c2 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -1050,7 +1050,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 	BKE_mesh_assign_object(ob, new_mesh);
 	BKE_mesh_calc_normals(new_mesh);
 
-	if (old_mesh->id.us == 0) BKE_libblock_free(&G.main->mesh, old_mesh);
+	if (old_mesh->id.us == 0) BKE_libblock_free(G.main, old_mesh);
 	
 	char layername[100];
 	layername[0] = '\0';