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/shader_fx/intern | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/shader_fx/intern')
-rw-r--r-- | source/blender/shader_fx/intern/FX_shader_util.h | 5 | ||||
-rw-r--r-- | source/blender/shader_fx/intern/FX_ui_common.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/shader_fx/intern/FX_shader_util.h b/source/blender/shader_fx/intern/FX_shader_util.h index 8ff5a6c0d0e..9617cfd2ee0 100644 --- a/source/blender/shader_fx/intern/FX_shader_util.h +++ b/source/blender/shader_fx/intern/FX_shader_util.h @@ -21,7 +21,4 @@ * \ingroup shader_fx */ -#ifndef __FX_SHADER_UTIL_H__ -#define __FX_SHADER_UTIL_H__ - -#endif /* __FX_SHADER_UTIL_H__ */ +#pragma once diff --git a/source/blender/shader_fx/intern/FX_ui_common.h b/source/blender/shader_fx/intern/FX_ui_common.h index 877855b98e4..ce3038776ba 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.h +++ b/source/blender/shader_fx/intern/FX_ui_common.h @@ -18,8 +18,7 @@ * \ingroup modifiers */ -#ifndef __FX_UI_COMMON_H__ -#define __FX_UI_COMMON_H__ +#pragma once #include "FX_shader_types.h" @@ -52,5 +51,3 @@ struct PanelType *shaderfx_subpanel_register(struct ARegionType *region_type, #ifdef __cplusplus } #endif - -#endif /* __FX_UI_COMMON_H__ */ |