Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / library.c
index 869e02448eac326cc8743dd73e7275974b67488f..978f1acefbaf5c730987da3f7afc5f54ef323519 100644 (file)
 #include "BKE_mask.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
-#include "BKE_particle.h"
 #include "BKE_packedFile.h"
 #include "BKE_speaker.h"
 #include "BKE_scene.h"
@@ -344,9 +343,6 @@ bool id_make_local(Main *bmain, ID *id, bool test)
                case ID_BR:
                        if (!test) BKE_brush_make_local(bmain, (Brush *)id);
                        return true;
-               case ID_PA:
-                       if (!test) BKE_particlesettings_make_local(bmain, (ParticleSettings *)id);
-                       return true;
                case ID_WM:
                        return false; /* can't be linked */
                case ID_GD:
@@ -441,9 +437,6 @@ bool id_copy(Main *bmain, ID *id, ID **newid, bool test)
                case ID_BR:
                        if (!test) *newid = (ID *)BKE_brush_copy(bmain, (Brush *)id);
                        return true;
-               case ID_PA:
-                       if (!test) *newid = (ID *)BKE_particlesettings_copy(bmain, (ParticleSettings *)id);
-                       return true;
                case ID_WM:
                        return false;  /* can't be copied from here */
                case ID_GD:
@@ -541,8 +534,6 @@ ListBase *which_libbase(Main *mainlib, short type)
                        return &(mainlib->nodetree);
                case ID_BR:
                        return &(mainlib->brush);
-               case ID_PA:
-                       return &(mainlib->particle);
                case ID_WM:
                        return &(mainlib->wm);
                case ID_GD:
@@ -694,7 +685,6 @@ int set_listbasepointers(Main *main, ListBase **lb)
        lb[a++] = &(main->palettes);
        lb[a++] = &(main->paintcurves);
        lb[a++] = &(main->brush);
-       lb[a++] = &(main->particle);
        lb[a++] = &(main->speaker);
 
        lb[a++] = &(main->world);
@@ -807,9 +797,6 @@ void *BKE_libblock_alloc_notest(short type)
                case ID_BR:
                        id = MEM_callocN(sizeof(Brush), "brush");
                        break;
-               case ID_PA:
-                       id = MEM_callocN(sizeof(ParticleSettings), "ParticleSettings");
-                       break;
                case ID_WM:
                        id = MEM_callocN(sizeof(wmWindowManager), "Window manager");
                        break;
@@ -951,9 +938,6 @@ void BKE_libblock_init_empty(ID *id)
                case ID_BR:
                        BKE_brush_init((Brush *)id);
                        break;
-               case ID_PA:
-                       /* Nothing to do. */
-                       break;
                case ID_PC:
                        /* Nothing to do. */
                        break;