[Bf-blender-cvs] [6b655ca] master: Cleanup: style
Campbell Barton
noreply at git.blender.org
Wed Jan 21 02:02:27 CET 2015
Commit: 6b655ca62cb5e480ab3da95d8afd98713a835025
Author: Campbell Barton
Date: Wed Jan 21 11:57:11 2015 +1100
Branches: master
https://developer.blender.org/rB6b655ca62cb5e480ab3da95d8afd98713a835025
Cleanup: style
===================================================================
M source/blender/blenkernel/intern/appdir.c
M source/blender/collada/ImportSettings.cpp
M source/blender/collada/ImportSettings.h
M source/blender/makesrna/intern/rna_mesh_utils.h
M source/blender/physics/intern/BPH_mass_spring.cpp
M source/blender/physics/intern/hair_volume.cpp
M source/blender/physics/intern/implicit.h
M source/blender/physics/intern/implicit_blender.c
M source/blender/physics/intern/implicit_eigen.cpp
M source/gameengine/GameLogic/SCA_IInputDevice.h
M source/gameengine/GameLogic/SCA_IObject.h
M source/gameengine/GameLogic/SCA_ISensor.h
M source/gameengine/GameLogic/SCA_LogicManager.h
M source/gameengine/Ketsji/BL_ActionManager.h
===================================================================
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 50f9a9b..9f34d5b 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 7460778..9483aa1 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 51a13da..783f58e 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 c0ea1a1..f68a48c 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 668efbb..a4f4fb1 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 c181cdc..3e98d3b 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 2f71485..f0d59d9 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 56ce112..cdc3bda 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 <sys/time.h>
@@ -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 d9e4d38..0ea8ccb 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 23346c2..d4cd66f 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 365e2b0..3ffe128 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 091aa67..7bbba7a 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 4d8c200..1275a7c 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 5b34025..148097f 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
*/
More information about the Bf-blender-cvs
mailing list