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/simulation/intern/simulation_collect_influences.hh | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/simulation/intern/simulation_collect_influences.hh')
-rw-r--r-- | source/blender/simulation/intern/simulation_collect_influences.hh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/simulation/intern/simulation_collect_influences.hh b/source/blender/simulation/intern/simulation_collect_influences.hh index caf5a8c4ffa..8673a308b04 100644 --- a/source/blender/simulation/intern/simulation_collect_influences.hh +++ b/source/blender/simulation/intern/simulation_collect_influences.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_SIMULATION_COLLECT_INFLUENCES_HH__ -#define __SIM_SIMULATION_COLLECT_INFLUENCES_HH__ +#pragma once #include "NOD_derived_node_tree.hh" @@ -64,5 +63,3 @@ void collect_simulation_influences(Simulation &simulation, RequiredStates &r_required_states); } // namespace blender::sim - -#endif /* __SIM_SIMULATION_COLLECT_INFLUENCES_HH__ */ |