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/makesdna/DNA_object_enums.h | |
parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/makesdna/DNA_object_enums.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_enums.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_object_enums.h b/source/blender/makesdna/DNA_object_enums.h index f3e69161c85..dbbd72c2075 100644 --- a/source/blender/makesdna/DNA_object_enums.h +++ b/source/blender/makesdna/DNA_object_enums.h @@ -20,8 +20,7 @@ * Enums typedef's for use in public headers. */ -#ifndef __DNA_OBJECT_ENUMS_H__ -#define __DNA_OBJECT_ENUMS_H__ +#pragma once /** #Object.mode */ typedef enum eObjectMode { @@ -69,5 +68,3 @@ typedef enum eDrawType { (OB_MODE_EDIT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_SCULPT | OB_MODE_POSE | \ OB_MODE_PAINT_GPENCIL | OB_MODE_EDIT_GPENCIL | OB_MODE_SCULPT_GPENCIL | \ OB_MODE_WEIGHT_GPENCIL | OB_MODE_VERTEX_GPENCIL) - -#endif /* __DNA_OBJECT_ENUMS_H__ */ |