diff options
| author | Pasi Keränen <pasi.keranen@qt.io> | 2019-05-29 17:00:46 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@qt.io> | 2019-05-31 16:39:22 +0300 |
| commit | ff1687d03374de568199dc9aced1794cd6947e3e (patch) | |
| tree | d052c83400e26e52f4e5bdd02c10f8bd1a18c783 /src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib | |
| parent | 3f85997352569286e2e26c43406ea6697d352dad (diff) | |
Move files required by OpenGL runtime within ogl-runtime directory
First step towards ejecting ogl-runtime in to its own repository.
Task-number: QT3DS-3596
Change-Id: I8c551aef5f680d89221a8075bbeff8857ad2a318
Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib')
| -rw-r--r-- | src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib b/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib deleted file mode 100644 index 6901ace0..00000000 --- a/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 NVIDIA Corporation. -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt 3D Studio. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DS_DEFAULT_MATERIAL_FILE_BUMP_TEXTURE_GLSLLIB -#define QT3DS_DEFAULT_MATERIAL_FILE_BUMP_TEXTURE_GLSLLIB - -#ifndef QT3DS_DEFINE_API -#define QT3DS_DEFINE_API -#endif - -#include "fileBumpTexture.glsllib" - -#endif
\ No newline at end of file |