From 6b655ca62cb5e480ab3da95d8afd98713a835025 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 21 Jan 2015 11:57:11 +1100 Subject: Cleanup: style --- source/blender/blenkernel/intern/appdir.c | 2 +- source/blender/collada/ImportSettings.cpp | 2 +- source/blender/collada/ImportSettings.h | 2 +- source/blender/makesrna/intern/rna_mesh_utils.h | 2 +- source/blender/physics/intern/BPH_mass_spring.cpp | 2 +- source/blender/physics/intern/hair_volume.cpp | 28 +++++++++++------------ source/blender/physics/intern/implicit.h | 4 ++-- source/blender/physics/intern/implicit_blender.c | 8 +++---- source/blender/physics/intern/implicit_eigen.cpp | 2 +- source/gameengine/GameLogic/SCA_IInputDevice.h | 2 +- source/gameengine/GameLogic/SCA_IObject.h | 2 +- source/gameengine/GameLogic/SCA_ISensor.h | 2 +- source/gameengine/GameLogic/SCA_LogicManager.h | 2 +- source/gameengine/Ketsji/BL_ActionManager.h | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 50f9a9be05d..9f34d5b9cd9 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -17,7 +17,7 @@ * */ -/** \file blender/blenlib/intern/appdir.c +/** \file blender/blenkernel/intern/appdir.c * \ingroup bke * * Access to application level directories. diff --git a/source/blender/collada/ImportSettings.cpp b/source/blender/collada/ImportSettings.cpp index 74607787f25..9483aa1ac76 100644 --- a/source/blender/collada/ImportSettings.cpp +++ b/source/blender/collada/ImportSettings.cpp @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/collada/ExportSettings.cpp +/** \file blender/collada/ImportSettings.cpp * \ingroup collada */ diff --git a/source/blender/collada/ImportSettings.h b/source/blender/collada/ImportSettings.h index 51a13da7724..783f58e6bff 100644 --- a/source/blender/collada/ImportSettings.h +++ b/source/blender/collada/ImportSettings.h @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file ExportSettings.h +/** \file ImportSettings.h * \ingroup collada */ diff --git a/source/blender/makesrna/intern/rna_mesh_utils.h b/source/blender/makesrna/intern/rna_mesh_utils.h index c0ea1a153ff..f68a48c075b 100644 --- a/source/blender/makesrna/intern/rna_mesh_utils.h +++ b/source/blender/makesrna/intern/rna_mesh_utils.h @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/source/blender/makesrna/intern/rna_mesh_utils.h +/** \file blender/makesrna/intern/rna_mesh_utils.h * \ingroup RNA */ diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index 668efbba315..a4f4fb1dcee 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenkernel/intern/BPH_mass_spring.c +/** \file blender/physics/intern/BPH_mass_spring.cpp * \ingroup bph */ diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp index c181cdc0f37..3e98d3b60c3 100644 --- a/source/blender/physics/intern/hair_volume.cpp +++ b/source/blender/physics/intern/hair_volume.cpp @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenkernel/intern/hair_volume.c +/** \file blender/physics/intern/hair_volume.cpp * \ingroup bph */ @@ -620,19 +620,19 @@ bool BPH_hair_volume_solve_divergence(HairGrid *grid, float dt, float target_den HairGridVert *vert; int i, j, k; - #define MARGIN_i0 (i < 1) - #define MARGIN_j0 (j < 1) - #define MARGIN_k0 (k < 1) - #define MARGIN_i1 (i >= resA[0]-1) - #define MARGIN_j1 (j >= resA[1]-1) - #define MARGIN_k1 (k >= resA[2]-1) - - #define NEIGHBOR_MARGIN_i0 (i < 2) - #define NEIGHBOR_MARGIN_j0 (j < 2) - #define NEIGHBOR_MARGIN_k0 (k < 2) - #define NEIGHBOR_MARGIN_i1 (i >= resA[0]-2) - #define NEIGHBOR_MARGIN_j1 (j >= resA[1]-2) - #define NEIGHBOR_MARGIN_k1 (k >= resA[2]-2) +#define MARGIN_i0 (i < 1) +#define MARGIN_j0 (j < 1) +#define MARGIN_k0 (k < 1) +#define MARGIN_i1 (i >= resA[0]-1) +#define MARGIN_j1 (j >= resA[1]-1) +#define MARGIN_k1 (k >= resA[2]-1) + +#define NEIGHBOR_MARGIN_i0 (i < 2) +#define NEIGHBOR_MARGIN_j0 (j < 2) +#define NEIGHBOR_MARGIN_k0 (k < 2) +#define NEIGHBOR_MARGIN_i1 (i >= resA[0]-2) +#define NEIGHBOR_MARGIN_j1 (j >= resA[1]-2) +#define NEIGHBOR_MARGIN_k1 (k >= resA[2]-2) BLI_assert(num_cells >= 1); diff --git a/source/blender/physics/intern/implicit.h b/source/blender/physics/intern/implicit.h index 2f71485f914..f0d59d92c91 100644 --- a/source/blender/physics/intern/implicit.h +++ b/source/blender/physics/intern/implicit.h @@ -25,8 +25,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BPH_IMPLICIT_H__ -#define __BPH_IMPLICIT_H__ +#ifndef __IMPLICIT_H__ +#define __IMPLICIT_H__ /** \file implicit.h * \ingroup bph diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index 56ce1129cc7..cdc3bda3b11 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenkernel/intern/implicit.c +/** \file blender/physics/intern/implicit_blender.c * \ingroup bph */ @@ -81,7 +81,7 @@ static void itend(void) double itval(void) { return ((double)_itend.QuadPart - - (double)_itstart.QuadPart)/((double)ifreq.QuadPart); + (double)_itstart.QuadPart)/((double)ifreq.QuadPart); } #else #include @@ -409,8 +409,8 @@ DO_INLINE void initdiag_fmatrixS(float to[3][3], float aS) /* calculate determinant of 3x3 matrix */ DO_INLINE float det_fmatrix(float m[3][3]) { - return m[0][0]*m[1][1]*m[2][2] + m[1][0]*m[2][1]*m[0][2] + m[0][1]*m[1][2]*m[2][0] - -m[0][0]*m[1][2]*m[2][1] - m[0][1]*m[1][0]*m[2][2] - m[2][0]*m[1][1]*m[0][2]; + return m[0][0]*m[1][1]*m[2][2] + m[1][0]*m[2][1]*m[0][2] + m[0][1]*m[1][2]*m[2][0] - + m[0][0]*m[1][2]*m[2][1] - m[0][1]*m[1][0]*m[2][2] - m[2][0]*m[1][1]*m[0][2]; } DO_INLINE void inverse_fmatrix(float to[3][3], float from[3][3]) diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp index d9e4d38dd70..0ea8ccb0a49 100644 --- a/source/blender/physics/intern/implicit_eigen.cpp +++ b/source/blender/physics/intern/implicit_eigen.cpp @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenkernel/intern/implicit_eigen.cpp +/** \file blender/physics/intern/implicit_eigen.cpp * \ingroup bph */ diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index 23346c29601..d4cd66fb564 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file SCA_IController.h +/** \file SCA_IInputDevice.h * \ingroup gamelogic * \brief Interface for input devices. The defines for keyboard/system/mouse events * here are for internal use in the KX module. diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index 365e2b0c853..3ffe128c3b3 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -24,7 +24,7 @@ * * ***** END GPL LICENSE BLOCK ***** */ -/** \file SCA_IController.h +/** \file SCA_IObject.h * \ingroup gamelogic * \brief An abstract object that has some logic, python scripting and * reference counting Note: transformation stuff has been moved to diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h index 091aa675741..7bbba7aaafe 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.h +++ b/source/gameengine/GameLogic/SCA_ISensor.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file SCA_IController.h +/** \file SCA_ISensor.h * \ingroup gamelogic * \brief Interface Class for all logic Sensors. Implements * pulsemode and pulsefrequency, and event suppression. diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h index 4d8c20065b5..1275a7c5085 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.h +++ b/source/gameengine/GameLogic/SCA_LogicManager.h @@ -24,7 +24,7 @@ * * ***** END GPL LICENSE BLOCK ***** */ -/** \file SCA_IController.h +/** \file SCA_LogicManager.h * \ingroup gamelogic * \brief Regulates the top-level logic behavior for one scene. */ diff --git a/source/gameengine/Ketsji/BL_ActionManager.h b/source/gameengine/Ketsji/BL_ActionManager.h index 5b340257881..148097f995e 100644 --- a/source/gameengine/Ketsji/BL_ActionManager.h +++ b/source/gameengine/Ketsji/BL_ActionManager.h @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file BL_ActionManager.cpp +/** \file BL_ActionManager.h * \ingroup ketsji */ -- cgit v1.2.3