Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / scene.c
index a699427..fb6173c 100644 (file)
@@ -284,7 +284,6 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
                BKE_paint_copy(&ts->imapaint.paint, &ts->imapaint.paint);
                ts->imapaint.paintcursor = NULL;
                id_us_plus((ID *)ts->imapaint.stencil);
-               ts->particle.paintcursor = NULL;
                /* duplicate Grease Pencil Drawing Brushes */
                BLI_listbase_clear(&ts->gp_brushes);
                for (bGPDbrush *brush = sce->toolsettings->gp_brushes.first; brush; brush = brush->next) {
@@ -465,8 +464,6 @@ void BKE_scene_free(Scene *sce)
 
 void BKE_scene_init(Scene *sce)
 {
-       ParticleEditSettings *pset;
-       int a;
        const char *colorspace_name;
        SceneRenderView *srv;
        CurveMapping *mblur_shutter_curve;
@@ -642,23 +639,6 @@ void BKE_scene_init(Scene *sce)
 
        sce->unit.scale_length = 1.0f;
 
-       pset = &sce->toolsettings->particle;
-       pset->flag = PE_KEEP_LENGTHS | PE_LOCK_FIRST | PE_DEFLECT_EMITTER | PE_AUTO_VELOCITY;
-       pset->emitterdist = 0.25f;
-       pset->totrekey = 5;
-       pset->totaddkey = 5;
-       pset->brushtype = PE_BRUSH_NONE;
-       pset->draw_step = 2;
-       pset->fade_frames = 2;
-       pset->selectmode = SCE_SELECT_PATH;
-       for (a = 0; a < PE_TOT_BRUSH; a++) {
-               pset->brush[a].strength = 0.5f;
-               pset->brush[a].size = 50;
-               pset->brush[a].step = 10;
-               pset->brush[a].count = 10;
-       }
-       pset->brush[PE_BRUSH_CUT].strength = 1.0f;
-
        sce->r.ffcodecdata.audio_mixrate = 48000;
        sce->r.ffcodecdata.audio_volume = 1.0f;
        sce->r.ffcodecdata.audio_bitrate = 192;