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 | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/simulation')
10 files changed, 10 insertions, 40 deletions
diff --git a/source/blender/simulation/SIM_mass_spring.h b/source/blender/simulation/SIM_mass_spring.h index d30a7160fd8..219ead477c2 100644 --- a/source/blender/simulation/SIM_mass_spring.h +++ b/source/blender/simulation/SIM_mass_spring.h @@ -21,8 +21,7 @@ * \ingroup bph */ -#ifndef __SIM_MASS_SPRING_H__ -#define __SIM_MASS_SPRING_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -58,5 +57,3 @@ void SIM_cloth_solver_set_volume(ClothModifierData *clmd); #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/simulation/SIM_simulation_update.hh b/source/blender/simulation/SIM_simulation_update.hh index efdfde8a4de..7c2726f038e 100644 --- a/source/blender/simulation/SIM_simulation_update.hh +++ b/source/blender/simulation/SIM_simulation_update.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_SIMULATION_UPDATE_HH__ -#define __SIM_SIMULATION_UPDATE_HH__ +#pragma once struct Depsgraph; struct Scene; @@ -30,5 +29,3 @@ void update_simulation_in_depsgraph(Depsgraph *depsgraph, bool update_simulation_dependencies(Simulation *simulation); } // namespace blender::sim - -#endif /* __SIM_SIMULATION_UPDATE_HH__ */ diff --git a/source/blender/simulation/intern/ConstrainedConjugateGradient.h b/source/blender/simulation/intern/ConstrainedConjugateGradient.h index c924490f97d..b0f2bb037d2 100644 --- a/source/blender/simulation/intern/ConstrainedConjugateGradient.h +++ b/source/blender/simulation/intern/ConstrainedConjugateGradient.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __CONSTRAINEDCONJUGATEGRADIENT_H__ -#define __CONSTRAINEDCONJUGATEGRADIENT_H__ +#pragma once #include <Eigen/Core> @@ -331,5 +330,3 @@ struct solve_retval<ConstrainedConjugateGradient<_MatrixType, _UpLo, _Filter, _P } // end namespace internal } // end namespace Eigen - -#endif // __CONSTRAINEDCONJUGATEGRADIENT_H__ diff --git a/source/blender/simulation/intern/eigen_utils.h b/source/blender/simulation/intern/eigen_utils.h index c186cf567df..897ba8b2a67 100644 --- a/source/blender/simulation/intern/eigen_utils.h +++ b/source/blender/simulation/intern/eigen_utils.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __EIGEN_UTILS_H__ -#define __EIGEN_UTILS_H__ +#pragma once /** \file * \ingroup bph @@ -232,5 +231,3 @@ BLI_INLINE void print_lmatrix(const lMatrix &m) printf("\n"); } } - -#endif diff --git a/source/blender/simulation/intern/implicit.h b/source/blender/simulation/intern/implicit.h index 17dfb8b88b9..a3c8e5f34c4 100644 --- a/source/blender/simulation/intern/implicit.h +++ b/source/blender/simulation/intern/implicit.h @@ -17,8 +17,7 @@ * All rights reserved. */ -#ifndef __IMPLICIT_H__ -#define __IMPLICIT_H__ +#pragma once /** \file * \ingroup bph @@ -268,5 +267,3 @@ void SIM_hair_volume_vertex_grid_forces(struct HairGrid *grid, #ifdef __cplusplus } #endif - -#endif diff --git a/source/blender/simulation/intern/particle_allocator.hh b/source/blender/simulation/intern/particle_allocator.hh index 1c412508fe6..c0bbdb845d9 100644 --- a/source/blender/simulation/intern/particle_allocator.hh +++ b/source/blender/simulation/intern/particle_allocator.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_PARTICLE_ALLOCATOR_HH__ -#define __SIM_PARTICLE_ALLOCATOR_HH__ +#pragma once #include "BLI_array.hh" #include "BLI_vector.hh" @@ -97,5 +96,3 @@ class ParticleAllocator : NonCopyable, NonMovable { }; } // namespace blender::sim - -#endif /* __SIM_PARTICLE_ALLOCATOR_HH__ */ diff --git a/source/blender/simulation/intern/particle_function.hh b/source/blender/simulation/intern/particle_function.hh index c9b35640b47..ead4e6f3c31 100644 --- a/source/blender/simulation/intern/particle_function.hh +++ b/source/blender/simulation/intern/particle_function.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_PARTICLE_FUNCTION_HH__ -#define __SIM_PARTICLE_FUNCTION_HH__ +#pragma once #include "FN_attributes_ref.hh" #include "FN_multi_function.hh" @@ -93,5 +92,3 @@ class ParticleFunctionEvaluator { }; } // namespace blender::sim - -#endif /* __SIM_PARTICLE_FUNCTION_HH__ */ 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__ */ diff --git a/source/blender/simulation/intern/simulation_solver.hh b/source/blender/simulation/intern/simulation_solver.hh index 9d30ea87731..2cf8eb2aa27 100644 --- a/source/blender/simulation/intern/simulation_solver.hh +++ b/source/blender/simulation/intern/simulation_solver.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_SIMULATION_SOLVER_HH__ -#define __SIM_SIMULATION_SOLVER_HH__ +#pragma once #include "simulation_collect_influences.hh" @@ -36,5 +35,3 @@ void solve_simulation_time_step(Simulation &simulation, float time_step); } // namespace blender::sim - -#endif /* __SIM_SIMULATION_SOLVER_HH__ */ diff --git a/source/blender/simulation/intern/time_interval.hh b/source/blender/simulation/intern/time_interval.hh index 5996dc5d25b..034628fa9be 100644 --- a/source/blender/simulation/intern/time_interval.hh +++ b/source/blender/simulation/intern/time_interval.hh @@ -14,8 +14,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __SIM_TIME_INTERVAL_HH__ -#define __SIM_TIME_INTERVAL_HH__ +#pragma once #include "BLI_utildefines.h" @@ -89,5 +88,3 @@ class TimeInterval { }; } // namespace blender::sim - -#endif /* __SIM_TIME_INTERVAL_HH__ */ |