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

compile with those enabled.

3 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 1fc5684f9d7..b25996031c0 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -170,12 +170,12 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
 #endif
 		switch (ob->type) {
 		case OB_MESH:
-			BKE_libblock_free(&freestyle_bmain->object, ob);
-			BKE_libblock_free(&freestyle_bmain->mesh, data);
+			BKE_libblock_free(freestyle_bmain, ob);
+			BKE_libblock_free(freestyle_bmain, data);
 			break;
 		case OB_CAMERA:
-			BKE_libblock_free(&freestyle_bmain->object, ob);
-			BKE_libblock_free(&freestyle_bmain->camera, data);
+			BKE_libblock_free(freestyle_bmain, ob);
+			BKE_libblock_free(freestyle_bmain, data);
 			freestyle_scene->camera = NULL;
 			break;
 		default:
@@ -185,7 +185,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer()
 	BLI_freelistN(&freestyle_scene->base);
 
 	// release material
-	BKE_libblock_free(&freestyle_bmain->mat, material);
+	BKE_libblock_free(freestyle_bmain, material);
 }
 
 float BlenderStrokeRenderer::get_stroke_vertex_z(void) const
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 7dc218c74df..4cd879e5952 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -637,7 +637,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
 		next_text = (Text *) text->id.next;
 
 		BKE_text_unlink(&bmain, text);
-		BKE_libblock_free(&bmain.text, text);
+		BKE_libblock_free(&bmain, text);
 	}
 
 	return freestyle_render;
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index fbdc9bf3130..30ee6d30163 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -88,7 +88,7 @@ public:
 		if (text) {
 			status = BPY_text_exec(_context, text, reports, false);
 			BKE_text_unlink(&_freestyle_bmain, text);
-			BKE_libblock_free(&_freestyle_bmain.text, text);
+			BKE_libblock_free(&_freestyle_bmain, text);
 		}
 		else {
 			BKE_reportf(reports, RPT_ERROR, "Cannot open file: %s", fn);
@@ -181,7 +181,7 @@ private:
 
 		// cleaning up
 		BKE_text_unlink(&_freestyle_bmain, text);
-		BKE_libblock_free(&_freestyle_bmain.text, text);
+		BKE_libblock_free(&_freestyle_bmain, text);
 
 		_initialized = true;
 	}