Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / library.c
index 5d23788f6f76a83a945eaa6971547b37551f3e47..83549ae687965fc712e1015480846dccef946fee 100644 (file)
 #include "BKE_node.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
-#include "BKE_particle.h"
 #include "BKE_packedFile.h"
 #include "BKE_sound.h"
 #include "BKE_speaker.h"
@@ -412,9 +411,6 @@ bool id_make_local(Main *bmain, ID *id, const bool test, const bool lib_local)
                case ID_BR:
                        if (!test) BKE_brush_make_local(bmain, (Brush *)id, lib_local);
                        return true;
-               case ID_PA:
-                       if (!test) BKE_particlesettings_make_local(bmain, (ParticleSettings *)id, lib_local);
-                       return true;
                case ID_GD:
                        if (!test) BKE_gpencil_make_local(bmain, (bGPdata *)id, lib_local);
                        return true;
@@ -519,9 +515,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_GD:
                        if (!test) *newid = (ID *)BKE_gpencil_data_duplicate(bmain, (bGPdata *)id, false);
                        return true;
@@ -639,8 +632,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:
@@ -793,7 +784,6 @@ int set_listbasepointers(Main *main, ListBase **lb)
        lb[INDEX_ID_PAL] = &(main->palettes);
        lb[INDEX_ID_PC]  = &(main->paintcurves);
        lb[INDEX_ID_BR]  = &(main->brush);
-       lb[INDEX_ID_PA]  = &(main->particle);
        lb[INDEX_ID_SPK] = &(main->speaker);
 
        lb[INDEX_ID_WO]  = &(main->world);
@@ -904,9 +894,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;
@@ -1042,9 +1029,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;
@@ -1247,7 +1231,6 @@ void BKE_main_free(Main *mainvar)
                                case  31: BKE_libblock_free_ex(mainvar, id, false); break;
                                case  32: BKE_libblock_free_ex(mainvar, id, false); break;
                                case  33: BKE_libblock_free_ex(mainvar, id, false); break;
-                               case  34: BKE_libblock_free_ex(mainvar, id, false); break;
                                default:
                                        BLI_assert(0);
                                        break;