Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenkernel / intern / idcode.c

diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 899ed548783030a650d1556e8311ac0c2400c535..ea99fa8f55adac61cf3798c8a36aeac8adeb6f1c 100644 (file)
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -77,7 +77,6 @@ static IDType idtypes[] = {
        { ID_MSK,  "Mask",               "masks",           BLT_I18NCONTEXT_ID_MASK,               IDTYPE_FLAGS_ISLINKABLE },
        { ID_NT,   "NodeTree",           "node_groups",     BLT_I18NCONTEXT_ID_NODETREE,           IDTYPE_FLAGS_ISLINKABLE },
        { ID_OB,   "Object",             "objects",         BLT_I18NCONTEXT_ID_OBJECT,             IDTYPE_FLAGS_ISLINKABLE },
-       { ID_PA,   "ParticleSettings",   "particles",       BLT_I18NCONTEXT_ID_PARTICLESETTINGS,   IDTYPE_FLAGS_ISLINKABLE },
        { ID_PAL,  "Palettes",           "palettes",        BLT_I18NCONTEXT_ID_PALETTE,            IDTYPE_FLAGS_ISLINKABLE },
        { ID_PC,   "PaintCurve",         "paint_curves",    BLT_I18NCONTEXT_ID_PAINTCURVE,         IDTYPE_FLAGS_ISLINKABLE },
        { ID_SCE,  "Scene",              "scenes",          BLT_I18NCONTEXT_ID_SCENE,              IDTYPE_FLAGS_ISLINKABLE },
@@ -198,7 +197,6 @@ int BKE_idcode_to_idfilter(const short idcode)
                CASE_IDFILTER(MSK);
                CASE_IDFILTER(NT);
                CASE_IDFILTER(OB);
-               CASE_IDFILTER(PA);
                CASE_IDFILTER(PAL);
                CASE_IDFILTER(PC);
                CASE_IDFILTER(SCE);
@@ -241,7 +239,6 @@ short BKE_idcode_from_idfilter(const int idfilter)
                CASE_IDFILTER(MSK);
                CASE_IDFILTER(NT);
                CASE_IDFILTER(OB);
-               CASE_IDFILTER(PA);
                CASE_IDFILTER(PAL);
                CASE_IDFILTER(PC);
                CASE_IDFILTER(SCE);