diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-11 07:11:23 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-11 07:11:23 +0100 |
| commit | 6e86a0535050855d5c4e4d63002eea084f2e3ebf (patch) | |
| tree | ff202debefea046a88d244d70deb2eb4f49faf9d /scene | |
| parent | ebc581becfc78e29ff82c2ea955e2d1ed0b6e825 (diff) | |
| parent | a638af886e40ea749088ad0978cd24e0e70d0e23 (diff) | |
Merge pull request #4012 from sanikoyes/Pr-linke-fail-disable-3d
Fix link error when disable_3d=yes
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/main/viewport.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 2c94d2e093..5017ae61ff 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -894,6 +894,7 @@ void Viewport::_camera_remove(Camera* p_camera) { } } +#ifndef _3D_DISABLED void Viewport::_camera_make_next_current(Camera* p_exclude) { for(Set<Camera*>::Element *E=cameras.front();E;E=E->next()) { @@ -909,7 +910,7 @@ void Viewport::_camera_make_next_current(Camera* p_exclude) { } } - +#endif void Viewport::set_transparent_background(bool p_enable) { |