diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-26 18:21:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 18:21:08 +0200 |
| commit | 2a1a1f05feadc8c9b2e6a3058940456b65c3ecdc (patch) | |
| tree | de80d2ef7ab5b07e1e182e87199c16cc415c482c /editor/plugins/material_editor_plugin.cpp | |
| parent | 3c5ce736e63c0db6b2f0b5e8fef1119da5529df2 (diff) | |
| parent | 565600e8445a3073e4188a1a2bde1f47dd299c5a (diff) | |
Merge pull request #10656 from akien-mga/cleanup-commented-out-code
Cleanup tons of obsolete commented out code
Diffstat (limited to 'editor/plugins/material_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/material_editor_plugin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 751f39e55d..2afcf6a341 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -27,12 +27,14 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + +// FIXME: Disabled as (according to reduz) users were complaining that it gets in the way +// Waiting for PropertyEditor rewrite (planned for 3.1) to be refactored. +#if 0 #include "material_editor_plugin.h" #include "scene/main/viewport.h" -#if 0 - void MaterialEditor::_gui_input(InputEvent p_event) { |