diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-06-19 20:45:05 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-06-19 20:45:05 +0300 |
| commit | 74c46d11a0287f43a0365b4dc8a194d8547d61ba (patch) | |
| tree | 5481d0e0661c3090bf125cfe12820a11f79848b4 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 0ba1d68c30ff605e96ae0a8f9451511d2bdd789c (diff) | |
| parent | ce7a5a23767c2f628a69496590b415318f7eb89f (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenloader/intern/versioning_290.c
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f52ff83bc61..8aac92d2128 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1628,8 +1628,10 @@ typedef struct SceneEEVEE { float bloom_radius; float bloom_clamp; - int motion_blur_samples; + int motion_blur_samples DNA_DEPRECATED; + int motion_blur_max; float motion_blur_shutter; + float motion_blur_depth_scale; int shadow_method DNA_DEPRECATED; int shadow_cube_size; |