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/editors/physics | |
| parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
| parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit_utildefines.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_intern.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/physics/particle_edit_utildefines.h b/source/blender/editors/physics/particle_edit_utildefines.h index dc858687341..289ca193f17 100644 --- a/source/blender/editors/physics/particle_edit_utildefines.h +++ b/source/blender/editors/physics/particle_edit_utildefines.h @@ -21,8 +21,7 @@ * \ingroup edphys */ -#ifndef __PARTICLE_EDIT_UTILDEFINES_H__ -#define __PARTICLE_EDIT_UTILDEFINES_H__ +#pragma once #define KEY_K \ PTCacheEditKey *key; \ @@ -58,5 +57,3 @@ if (key->flag & PEK_TAG) #define KEY_WCO ((key->flag & PEK_USE_WCO) ? key->world_co : key->co) - -#endif /* __PARTICLE_EDIT_UTILDEFINES_H__ */ diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index 87c3a709d47..4dc3ded9bd7 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -21,8 +21,7 @@ * \ingroup edphys */ -#ifndef __PHYSICS_INTERN_H__ -#define __PHYSICS_INTERN_H__ +#pragma once struct Depsgraph; struct Object; @@ -152,5 +151,3 @@ void RIGIDBODY_OT_constraint_remove(struct wmOperatorType *ot); void RIGIDBODY_OT_world_add(struct wmOperatorType *ot); void RIGIDBODY_OT_world_remove(struct wmOperatorType *ot); void RIGIDBODY_OT_world_export(struct wmOperatorType *ot); - -#endif /* __PHYSICS_INTERN_H__ */ |