diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-14 17:47:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-15 13:09:16 +0300 |
commit | 6af97b84dfa286fc5c8efb2b0536ed1b87f591b0 (patch) | |
tree | d335327ddcf6d5d2a4c1a4ecdb3de0034f6b4ab4 /source/blender/editors | |
parent | 2f39ca38437d94a63ba020ef110b413ee3f7894b (diff) |
Cleanup: replace usages of deprecated BKE_libblock_free by BKE_id_free.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_bake_api.c | 8 | ||||
-rw-r--r-- | source/blender/editors/scene/scene_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sound/sound_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_group.c | 4 |
5 files changed, 10 insertions, 10 deletions
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/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -274,13 +274,13 @@ static int node_group_ungroup(Main *bmain, bNodeTree *ntree, bNode *gnode) /* free temp action too */ if (waction) { - BKE_libblock_free(bmain, waction); + BKE_id_free(bmain, waction); wgroup->adt->action = NULL; } } /* free the group tree (takes care of user count) */ - BKE_libblock_free(bmain, wgroup); + BKE_id_free(bmain, wgroup); /* restore external links to and from the gnode */ /* note: the nodes have been copied to intermediate wgroup first (so need to use new_node), |