diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/io/collada/Materials.h | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/io/collada/Materials.h')
| -rw-r--r-- | source/blender/io/collada/Materials.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/io/collada/Materials.h b/source/blender/io/collada/Materials.h index e1d12246a2b..f671a00758d 100644 --- a/source/blender/io/collada/Materials.h +++ b/source/blender/io/collada/Materials.h @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __MATERIALS_H__ -#define __MATERIALS_H__ +#pragma once #include <map> #include <string> @@ -70,5 +69,3 @@ class MaterialNode { COLLADAFW::ColorOrTexture &cot, COLLADAFW::FloatOrParam &val); }; - -#endif /* __MATERIALS_H__ */ |