Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index 60bd37799fbff490caf921fe87aff8b300738f50..87b6813712ffb9513559eac9b105bc65a7862f3b 100644 (file)
@@ -1008,39 +1008,6 @@ typedef struct ImagePaintSettings {
        float dither;              /* dither amount used when painting on byte images */
 } ImagePaintSettings;
 
        float dither;              /* dither amount used when painting on byte images */
 } ImagePaintSettings;
 
-/* ------------------------------------------- */
-/* Particle Edit */
-
-/* Settings for a Particle Editing Brush */
-typedef struct ParticleBrushData {
-       short size;                                             /* common setting */
-       short step, invert, count;              /* for specific brushes only */
-       int flag;
-       float strength;
-} ParticleBrushData;
-
-/* Particle Edit Mode Settings */
-typedef struct ParticleEditSettings {
-       short flag;
-       short totrekey;
-       short totaddkey;
-       short brushtype;
-
-       ParticleBrushData brush[7]; /* 7 = PE_TOT_BRUSH */
-       void *paintcursor;                      /* runtime */
-
-       float emitterdist, rt;
-
-       int selectmode;
-       int edittype;
-
-       int draw_step, fade_frames;
-
-       struct Scene *scene;
-       struct Object *object;
-       struct Object *shape_object;
-} ParticleEditSettings;
-
 /* ------------------------------------------- */
 /* Sculpt */
 
 /* ------------------------------------------- */
 /* Sculpt */
 
@@ -1373,9 +1340,6 @@ typedef struct ToolSettings {
        /* Image Paint (8 byttse aligned please!) */
        struct ImagePaintSettings imapaint;
 
        /* Image Paint (8 byttse aligned please!) */
        struct ImagePaintSettings imapaint;
 
-       /* Particle Editing */
-       struct ParticleEditSettings particle;
-       
        /* Transform Proportional Area of Effect */
        float proportional_size;
 
        /* Transform Proportional Area of Effect */
        float proportional_size;