Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-06 22:00:42 +0300
committerDalai Felinto <dalai@blender.org>2020-03-06 22:07:02 +0300
commitafe6df1487fd001e18c30bd85660154753ece345 (patch)
tree9a18e26298bb5321e3327e98e6927b65b8aa3390 /source/blender/blenkernel/intern/lib_id.c
parent558f449f8c4b212302a2530daecda9346ea10177 (diff)
Cleanup: VFont: Move to IDTypeInfo and remove unused BKE API
This was particularly strange because we had a _free_data() function. But still the one I replaced was of course the _free() one. And we should rename the _free_data_ function later to avoid confusions.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id.c')
-rw-r--r--source/blender/blenkernel/intern/lib_id.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index b74bb134dd3..4843bd1bb2b 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -511,9 +511,7 @@ bool BKE_lib_id_make_local(Main *bmain, ID *id, const bool test, const int flags
BLI_assert(0);
return true;
case ID_VF:
- if (!test) {
- BKE_vfont_make_local(bmain, (VFont *)id, flags);
- }
+ BLI_assert(0);
return true;
case ID_TXT:
BLI_assert(0);
@@ -784,7 +782,7 @@ bool BKE_id_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int flag)
BKE_sound_copy_data(bmain, (bSound *)*r_newid, (bSound *)id, flag);
break;
case ID_VF:
- BKE_vfont_copy_data(bmain, (VFont *)*r_newid, (VFont *)id, flag);
+ BLI_assert(0);
break;
case ID_LI:
case ID_SCR:
@@ -1358,7 +1356,7 @@ void BKE_libblock_init_empty(ID *id)
/* Nothing to do. */
break;
case ID_VF:
- BKE_vfont_init((VFont *)id);
+ BLI_assert(0);
break;
case ID_TXT:
BLI_assert(0);