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/gpencil_modifiers/intern | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/gpencil_modifiers/intern')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h | 5 | ||||
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h index 9c6edb51d63..c85e939b13f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __MOD_UI_COMMON__GPENCIL_H__ -#define __MOD_UI_COMMON__GPENCIL_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -62,5 +61,3 @@ struct PanelType *gpencil_modifier_subpanel_register(struct ARegionType *region_ #ifdef __cplusplus } #endif - -#endif /* __MOD_UI_COMMON__GPENCIL_H__ */ diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h index 5cc3750639b..e5a6d9e6a8f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h @@ -21,8 +21,7 @@ * \ingroup modifiers */ -#ifndef __MOD_GPENCIL_UTIL_H__ -#define __MOD_GPENCIL_UTIL_H__ +#pragma once struct GHash; struct MDeformVert; @@ -46,5 +45,3 @@ bool is_stroke_affected_by_modifier(struct Object *ob, const bool inv4); float get_modifier_point_weight(struct MDeformVert *dvert, bool inverse, int def_nr); - -#endif /* __MOD_GPENCIL_UTIL_H__ */ |