diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
| commit | f4140f2c8138ec07ba06376c4d0d70d40fca6fad (patch) | |
| tree | b6d7d87fed15896b45b1a1cccfea1175bee0f426 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b (diff) | |
| parent | c4046e9082f61bfef87173d20c566a065f2602d7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d25391ca95d..065ee801b84 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1667,16 +1667,15 @@ typedef struct Scene { /* Grease Pencil */ struct bGPdata *gpd; + /* Movie Tracking */ + struct MovieClip *clip; /* active movie clip */ + /* Physics simulation settings */ struct PhysicsSettings physics_settings; - void *pad6; - uint64_t customdata_mask; /* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */ uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */ - /* Movie Tracking */ - struct MovieClip *clip; /* active movie clip */ /* Color Management */ ColorManagedViewSettings view_settings; |