Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-01-21 03:57:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-01-21 03:57:11 +0300
commit6b655ca62cb5e480ab3da95d8afd98713a835025 (patch)
treee3ae1a26da1868d6118132b3590ad4481304c61f /source/blender/physics/intern/hair_volume.cpp
parent280ed325a2b00e9241b45c313d689445e7708c25 (diff)
Cleanup: style
Diffstat (limited to 'source/blender/physics/intern/hair_volume.cpp')
-rw-r--r--source/blender/physics/intern/hair_volume.cpp28
1 files changed, 14 insertions, 14 deletions
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);