diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-12 18:54:20 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-12 18:54:20 +0300 |
| commit | 33f9fe3c620fef1d1ad2cb3443bf503afdb9db3b (patch) | |
| tree | a841b5f04d635d0af308f6bfce94c69ca6a2e6c1 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 25c67a65d686aa04570db7409618ad779318c17a (diff) | |
| parent | f24e9bb0380936bcaf6c194b54342a2977784cff (diff) | |
Merge branch 'blender-v2.83-release'
Conflicts:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 3ed9ce1ea06..1533b82ad4e 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1644,6 +1644,11 @@ typedef struct SceneEEVEE { float light_threshold; } SceneEEVEE; +typedef struct SceneGpencil { + float smaa_threshold; + char _pad[4]; +} SceneGpencil; + /* *************************************************************** */ /* Scene ID-Block */ @@ -1775,6 +1780,7 @@ typedef struct Scene { struct SceneDisplay display; struct SceneEEVEE eevee; + struct SceneGpencil grease_pencil_settings; } Scene; /* **************** RENDERDATA ********************* */ |