Depsgraph: New dependency graph integration commit
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index ed63aefa4dfefd5b6c21e845bbf06fb4cbb1ce9d..fe346eecec5aa751a060728767a5d228df95c2ce 100644 (file)
@@ -657,8 +657,10 @@ typedef struct RenderData {
        /* render simplify */
        int simplify_flag;
        short simplify_subsurf;
-       short simplify_shadowsamples;
+       short simplify_subsurf_render;
+       short simplify_shadowsamples, pad9;
        float simplify_particles;
+       float simplify_particles_render;
        float simplify_aosss;
 
        /* cineon */
@@ -1019,6 +1021,8 @@ typedef struct Sculpt {
 
        /* scale for constant detail size */
        float constant_detail;
+       float detail_percent;
+       float pad;
 
        struct Object *gravity_object;
        void *pad2;
@@ -1271,8 +1275,9 @@ typedef struct ToolSettings {
        char proportional_objects; /* proportional edit, object mode */
        char proportional_mask; /* proportional edit, mask editing */
        char proportional_action; /* proportional edit, action editor */
-       char proportional_ipo; /* proportional edit, graph editor */
-       char pad4[6];
+       char proportional_fcurve; /* proportional edit, graph editor */
+       char lock_markers; /* lock marker editing */
+       char pad4[5];
 
        char auto_normalize; /*auto normalizing mode in wpaint*/
        char multipaint; /* paint multiple bones in wpaint */
@@ -1396,6 +1401,7 @@ typedef struct Scene {
        void *fps_info;                                 /* (runtime) info/cache used for presenting playback framerate info to the user */
        
        /* none of the dependency graph  vars is mean to be saved */
+       struct Depsgraph *depsgraph;
        struct  DagForest *theDag;
        short dagflags;
        short recalc;                           /* recalc = counterpart of ob->recalc */
@@ -1848,7 +1854,8 @@ typedef enum SculptFlags {
        SCULPT_DYNTOPO_COLLAPSE = (1 << 11),
 
        /* If set, dynamic-topology detail size will be constant in object space */
-       SCULPT_DYNTOPO_DETAIL_CONSTANT = (1 << 13)
+       SCULPT_DYNTOPO_DETAIL_CONSTANT = (1 << 13),
+       SCULPT_DYNTOPO_DETAIL_BRUSH = (1 << 14),
 } SculptFlags;
 
 typedef enum ImagePaintMode {