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/common/intern/dupli_parent_finder.hh | |
parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/io/common/intern/dupli_parent_finder.hh')
-rw-r--r-- | source/blender/io/common/intern/dupli_parent_finder.hh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/io/common/intern/dupli_parent_finder.hh b/source/blender/io/common/intern/dupli_parent_finder.hh index e7e628665ee..3dcf037bb5e 100644 --- a/source/blender/io/common/intern/dupli_parent_finder.hh +++ b/source/blender/io/common/intern/dupli_parent_finder.hh @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2020 Blender Foundation. * All rights reserved. */ -#ifndef __IO_COMMON_DUPLI_PARENT_FINDER_H__ -#define __IO_COMMON_DUPLI_PARENT_FINDER_H__ +#pragma once #include "IO_dupli_persistent_id.hh" @@ -58,5 +57,3 @@ class DupliParentFinder final { }; } // namespace blender::io - -#endif
\ No newline at end of file |