Commit: e79b244097ae1a416edbd0e28cfd6f07bc2e2daa
Author: Brecht Van Lommel
Date: Wed Jan 15 19:15:51 2014 +0100
https://developer.blender.org/rBe79b244097ae1a416edbd0e28cfd6f07bc2e2daa
Fix collada and freestyle module compile errors after recent commit, forgot to
compile with those enabled.
===================================================================
M source/blender/collada/ControllerExporter.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/GeometryExporter.cpp
M source/blender/collada/MeshImporter.cpp
M
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/freestyle/intern/system/PythonInterpreter.h
===================================================================
diff --git a/source/blender/collada/ControllerExporter.cpp
b/source/blender/collada/ControllerExporter.cpp
index 948a3dc..17ac547 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 144fe75..f8fc035 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 d848db6..3d5d79f 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 c7652bd..fefd24a 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';
diff --git
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 1fc5684..b259960 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 7dc218c..4cd879e 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 fbdc9bf..30ee6d3 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
