diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-04 09:51:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 09:51:22 +0200 |
| commit | 352d8315f1856356854bce7ecb6e47fba97357e9 (patch) | |
| tree | 681935b8d9d987b9d9d4165c28237d61f0994096 | |
| parent | 5d9cab3aeb3c62df6b7b44e6e68c0ebbb67f7a45 (diff) | |
| parent | acd695060b43ba62cde46a5e8165a702ab211597 (diff) | |
Merge pull request #47116 from aaronfranke/3d-modules
Disable 3D-only modules when 3D is disabled
| -rw-r--r-- | modules/bullet/config.py | 1 | ||||
| -rw-r--r-- | modules/csg/config.py | 2 | ||||
| -rw-r--r-- | modules/gridmap/config.py | 2 | ||||
| -rw-r--r-- | modules/meshoptimizer/config.py | 2 | ||||
| -rw-r--r-- | modules/mobile_vr/config.py | 2 | ||||
| -rw-r--r-- | modules/vhacd/config.py | 2 | ||||
| -rw-r--r-- | modules/webxr/config.py | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/modules/bullet/config.py b/modules/bullet/config.py index be7cf74f6f..83605f1f9b 100644 --- a/modules/bullet/config.py +++ b/modules/bullet/config.py @@ -1,6 +1,7 @@ def can_build(env, platform): # API Changed and bullet is disabled at the moment return False + # Later change to return not env["disable_3d"] def configure(env): diff --git a/modules/csg/config.py b/modules/csg/config.py index 9106cbceca..3991b846f9 100644 --- a/modules/csg/config.py +++ b/modules/csg/config.py @@ -1,5 +1,5 @@ def can_build(env, platform): - return True + return not env["disable_3d"] def configure(env): diff --git a/modules/gridmap/config.py b/modules/gridmap/config.py index a6319fe1ea..720401b92d 100644 --- a/modules/gridmap/config.py +++ b/modules/gridmap/config.py @@ -1,5 +1,5 @@ def can_build(env, platform): - return True + return not env["disable_3d"] def configure(env): diff --git a/modules/meshoptimizer/config.py b/modules/meshoptimizer/config.py index 82e4e43397..b7e69569b9 100644 --- a/modules/meshoptimizer/config.py +++ b/modules/meshoptimizer/config.py @@ -1,6 +1,6 @@ def can_build(env, platform): # Having this on release by default, it's small and a lot of users like to do procedural stuff - return True + return not env["disable_3d"] def configure(env): diff --git a/modules/mobile_vr/config.py b/modules/mobile_vr/config.py index ee401c1a2a..f6b64fb690 100644 --- a/modules/mobile_vr/config.py +++ b/modules/mobile_vr/config.py @@ -1,5 +1,5 @@ def can_build(env, platform): - return True + return not env["disable_3d"] def configure(env): diff --git a/modules/vhacd/config.py b/modules/vhacd/config.py index d22f9454ed..a42f27fbe1 100644 --- a/modules/vhacd/config.py +++ b/modules/vhacd/config.py @@ -1,5 +1,5 @@ def can_build(env, platform): - return True + return not env["disable_3d"] def configure(env): diff --git a/modules/webxr/config.py b/modules/webxr/config.py index 9efebed4e6..f676ef3483 100644 --- a/modules/webxr/config.py +++ b/modules/webxr/config.py @@ -1,5 +1,5 @@ def can_build(env, platform): - return True + return not env["disable_3d"] def configure(env): |