diff options
| author | Sam Kottler <dev@samkottler.net> | 2020-08-13 17:58:33 +0300 |
|---|---|---|
| committer | Sam Kottler <dev@samkottler.net> | 2020-08-13 17:58:33 +0300 |
| commit | 7c38d008de5ebdcb96ebdd67b8dc459d5551702f (patch) | |
| tree | 8fb22f60bc31019e3fe8f5b2bf35159c2e32cda9 /source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | |
| parent | cc86e03fd52cd68e66b817590aac80ec2a358d3e (diff) | |
| parent | 4e103101f7a20eaa2a61306a1070a04b63a69958 (diff) | |
Merge branch 'blender-v2.90-release' into soc-2020-production-ready-light-tree-2
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 26070a88e5d..51ac281e330 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -34,8 +34,6 @@ using namespace Freestyle; #include "MEM_guardedalloc.h" -extern "C" { - #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_freestyle_types.h" @@ -65,6 +63,8 @@ extern "C" { #include "FRS_freestyle.h" +extern "C" { + #define DEFAULT_SPHERE_RADIUS 1.0f #define DEFAULT_DKR_EPSILON 0.0f |