diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/io/usd/intern/usd_writer_metaball.h | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/io/usd/intern/usd_writer_metaball.h')
-rw-r--r-- | source/blender/io/usd/intern/usd_writer_metaball.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/io/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.h index 9f51a3314a5..216f5a2638f 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.h +++ b/source/blender/io/usd/intern/usd_writer_metaball.h @@ -16,8 +16,7 @@ * The Original Code is Copyright (C) 2020 Blender Foundation. * All rights reserved. */ -#ifndef __USD_WRITER_METABALL_H__ -#define __USD_WRITER_METABALL_H__ +#pragma once #include "usd_writer_mesh.h" @@ -42,5 +41,3 @@ class USDMetaballWriter : public USDGenericMeshWriter { } // namespace usd } // namespace io } // namespace blender - -#endif /* __USD_WRITER_METABALL_H__ */ |