[Bf-blender-cvs] [6af97b84dfa] master: Cleanup: replace usages of deprecated BKE_libblock_free by BKE_id_free.
Bastien Montagne
noreply at git.blender.org
Tue Jan 15 11:09:42 CET 2019
Commit: 6af97b84dfa286fc5c8efb2b0536ed1b87f591b0
Author: Bastien Montagne
Date: Mon Jan 14 15:47:11 2019 +0100
Branches: master
https://developer.blender.org/rB6af97b84dfa286fc5c8efb2b0536ed1b87f591b0
Cleanup: replace usages of deprecated BKE_libblock_free by BKE_id_free.
===================================================================
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_remap.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/workspace.c
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/scene/scene_edit.c
M source/blender/editors/screen/workspace_edit.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_node/node_group.c
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/render/intern/source/pipeline.c
M source/blender/windowmanager/intern/wm_files_link.c
===================================================================
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index cc42fe71579..d75274d4daa 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -443,9 +443,9 @@ bool BKE_blendfile_read_from_memfile(
if (bfd) {
/* remove the unused screens and wm */
while (bfd->main->wm.first)
- BKE_libblock_free(bfd->main, bfd->main->wm.first);
+ BKE_id_free(bfd->main, bfd->main->wm.first);
while (bfd->main->screen.first)
- BKE_libblock_free(bfd->main, bfd->main->screen.first);
+ BKE_id_free(bfd->main, bfd->main->screen.first);
setup_app_data(C, bfd, "<memory1>", params->is_startup, reports);
}
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 3efe288dcf4..550edce31e0 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -452,7 +452,7 @@ void BKE_image_merge(Main *bmain, Image *dest, Image *source)
}
BLI_spin_unlock(&image_spin);
- BKE_libblock_free(bmain, source);
+ BKE_id_free(bmain, source);
}
}
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 7634f1e0434..dcc4ac84d05 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -2035,7 +2035,7 @@ void BKE_library_make_local(
if (!is_lib) { /* Not used at all, we can free it! */
BLI_assert(!"Unused linked data copy remaining from MakeLibLocal process, should not happen anymore");
printf("\t%s (from %s)\n", id->name, id->lib->id.name);
- BKE_libblock_free(bmain, id);
+ BKE_id_free(bmain, id);
it->link = NULL;
do_loop = true;
}
@@ -2093,7 +2093,7 @@ void BKE_library_make_local(
BKE_libblock_free_ex(bmain, id, false, true);
#else
BKE_libblock_unlink(bmain, id, false, false);
- BKE_libblock_free(bmain, id);
+ BKE_id_free(bmain, id);
#endif
((LinkNode *)it->link)->link = NULL; /* Not strictly necessary, but safer (see T49903)... */
it->link = NULL;
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index a671b02cb67..a09599df4a2 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -973,7 +973,7 @@ void BKE_libblock_free_us(Main *bmain, void *idv) /* test users */
if (id->us == 0) {
BKE_libblock_unlink(bmain, id, false, false);
- BKE_libblock_free(bmain, id);
+ BKE_id_free(bmain, id);
}
}
@@ -1022,7 +1022,7 @@ void BKE_libblock_delete(Main *bmain, void *idv)
#endif
BLI_assert(id->us == 0);
}
- BKE_libblock_free(bmain, id);
+ BKE_id_free(bmain, id);
}
}
}
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index f5a5f13c6ef..71c21bf3208 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -638,7 +638,7 @@ void BKE_mesh_from_nurbs_displist(
* the entire scene with associated depsgraph updates, which are
* problematic for renderers exporting data. */
id_us_min(&cu->id);
- BKE_libblock_free(bmain, cu);
+ BKE_id_free(bmain, cu);
}
else {
BKE_libblock_free_us(bmain, cu);
@@ -921,11 +921,11 @@ Mesh *BKE_mesh_new_from_object(
* if it didn't the curve did not have any segments or otherwise
* would have generated an empty mesh */
if (tmpobj->type != OB_MESH) {
- BKE_libblock_free(bmain, tmpobj);
+ BKE_id_free(bmain, tmpobj);
return NULL;
}
- BKE_libblock_free(bmain, tmpobj);
+ BKE_id_free(bmain, tmpobj);
/* XXX The curve to mesh conversion is convoluted... But essentially, BKE_mesh_from_nurbs_displist()
* already transfers the ownership of materials from the temp copy of the Curve ID to the new
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 630921f71d1..6385a66eb8f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -5237,14 +5237,14 @@ Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoad
sound = BKE_sound_new_file(bmain, seq_load->path); /* handles relative paths */
if (sound->playback_handle == NULL) {
- BKE_libblock_free(bmain, sound);
+ BKE_id_free(bmain, sound);
return NULL;
}
info = AUD_getInfo(sound->playback_handle);
if (info.specs.channels == AUD_CHANNELS_INVALID) {
- BKE_libblock_free(bmain, sound);
+ BKE_id_free(bmain, sound);
return NULL;
}
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 0b1f9d8bd24..dca89a42c49 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -150,7 +150,7 @@ WorkSpace *BKE_workspace_add(Main *bmain, const char *name)
/**
* The function that actually frees the workspace data (not workspace itself). It shouldn't be called
- * directly, instead #BKE_workspace_remove should be, which calls this through #BKE_libblock_free then.
+ * directly, instead #BKE_workspace_remove should be, which calls this through #BKE_id_free then.
*
* Should something like a bke_internal.h be added, this should go there!
*/
@@ -173,7 +173,7 @@ void BKE_workspace_free(WorkSpace *workspace)
/**
* Remove \a workspace by freeing itself and its data. This is a higher-level wrapper that
- * calls #BKE_workspace_free (through #BKE_libblock_free) to free the workspace data, and frees
+ * calls #BKE_workspace_free (through #BKE_id_free) to free the workspace data, and frees
* other data-blocks owned by \a workspace and its layouts (currently that is screens only).
*
* Always use this to remove (and free) workspaces. Don't free non-ID workspace members here.
@@ -184,7 +184,7 @@ void BKE_workspace_remove(Main *bmain, WorkSpace *workspace)
layout_next = layout->next;
BKE_workspace_layout_remove(bmain, workspace, layout);
}
- BKE_libblock_free(bmain, workspace);
+ BKE_id_free(bmain, workspace);
}
WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const Main *bmain)
@@ -247,7 +247,7 @@ void BKE_workspace_layout_remove(
WorkSpace *workspace, WorkSpaceLayout *layout)
{
id_us_min(&layout->screen->id);
- BKE_libblock_free(bmain, layout->screen);
+ BKE_id_free(bmain, layout->screen);
BLI_freelinkN(&workspace->layouts, layout);
}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c27e70c9a7e..bc827abc933 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8682,7 +8682,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short
oldnewmap_clear(fd->datamap);
if (wrong_id) {
- BKE_libblock_free(main, id);
+ BKE_id_free(main, id);
}
return (bhead);
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 90b6be215d4..9239e1d1a6f 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -961,7 +961,7 @@ static int bake(
RE_bake_pixels_populate(me_nores, pixel_array_low, num_pixels, &bake_images, uv_layer);
RE_bake_normal_world_to_tangent(pixel_array_low, num_pixels, depth, result, me_nores, normal_swizzle, ob_low->obmat);
- BKE_libblock_free(bmain, me_nores);
+ BKE_id_free(bmain, me_nores);
if (md)
md->mode = mode;
@@ -1070,7 +1070,7 @@ cleanup:
int i;
for (i = 0; i < tot_highpoly; i++) {
if (highpoly[i].me)
- BKE_libblock_free(bmain, highpoly[i].me);
+ BKE_id_free(bmain, highpoly[i].me);
}
MEM_freeN(highpoly);
}
@@ -1094,10 +1094,10 @@ cleanup:
MEM_freeN(result);
if (me_low)
- BKE_libblock_free(bmain, me_low);
+ BKE_id_free(bmain, me_low);
if (me_cage)
- BKE_libblock_free(bmain, me_cage);
+ BKE_id_free(bmain, me_cage);
DEG_graph_free(depsgraph);
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c
index 0553e223c55..1755b143e24 100644
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@@ -115,7 +115,7 @@ bool ED_scene_delete(bContext *C, Main *bmain, wmWindow *win, Scene *scene)
id_us_clear_real(&scene->id);
if (scene->id.us == 0) {
- BKE_libblock_free(bmain, scene);
+ BKE_id_free(bmain, scene);
}
return true;
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index d8e0945eb25..d734bac1eee 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -238,7 +238,7 @@ bool ED_workspace_delete(
ED_workspace_change((prev != NULL) ? prev : next, C, wm, win);
}
- BKE_libblock_free(bmain, workspace_id);
+ BKE_id_free(bmain, workspace_id);
return true;
}
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 3ce4965b284..be93cc413fb 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -108,7 +108,7 @@ static int sound_open_exec(bContext *C, wmOperator *op)
if (sound->playback_handle == NULL) {
if (op->customdata) MEM_freeN(op->customdata);
- BKE_libblock_free(bmain, sound);
+ BKE_id_free(bmain, sound);
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
return OPERATOR_CANCELLED;
}
@@ -116,7 +116,7 @@ static int sound_open_exec(bContext *C, wmOperator *op)
info = AUD_getInfo(sound->playback_handle);
if (info.specs.channels == AUD_CHANNELS_INVALID) {
- BKE_libblock_free(bmain, sound);
+ BKE_id_free(bmain, sound);
if (op->customdata) MEM_freeN(op->customdata);
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
return OPERATOR_CANCELLED;
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index c7c856d95c4..e024a76c707 100644
--- a/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list