diff options
| author | Bastien Montagne <b.mont29@gmail.com> | 2020-03-19 21:37:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <b.mont29@gmail.com> | 2020-03-19 21:39:23 +0300 |
| commit | 12b621059a6f1337e8ae8fdd9533e7808225e71e (patch) | |
| tree | d04a2fddc28152235191e2d93884f4d143410d85 /source/blender/makesrna/intern/rna_main_api.c | |
| parent | 0b7854323d41f3a1a55a40ddf76a90e2017a0784 (diff) | |
Cleanup/refactor: remove BKE_idcode, in favour of BKE_idtype.
Mpving utils from idcode to idtype proved to be somewhat painful for
some reasons, but now all looks good.
Had to add a fake/empty shell for the special snowflake too,
`ID_LINK_PLACEHOLDER/INDEX_ID_NULL`...
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 6143af32c75..9799054ccd2 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -51,7 +51,7 @@ # include "BKE_gpencil.h" # include "BKE_hair.h" # include "BKE_icons.h" -# include "BKE_idcode.h" +# include "BKE_idtype.h" # include "BKE_image.h" # include "BKE_lattice.h" # include "BKE_lib_remap.h" @@ -135,7 +135,7 @@ static void rna_Main_ID_remove(Main *bmain, BKE_reportf(reports, RPT_ERROR, "%s '%s' is outside of main database and can not be removed from it", - BKE_idcode_to_name(GS(id->name)), + BKE_idtype_idcode_to_name(GS(id->name)), id->name + 2); return; } @@ -157,7 +157,7 @@ static void rna_Main_ID_remove(Main *bmain, reports, RPT_ERROR, "%s '%s' must have zero users to be removed, found %d (try with do_unlink=True parameter)", - BKE_idcode_to_name(GS(id->name)), + BKE_idtype_idcode_to_name(GS(id->name)), id->name + 2, ID_REAL_USERS(id)); } |