Commit: 84ba6ef14ab0effa5c504932933d802c5522d5ee
Author: Bastien Montagne
Date: Fri Dec 16 10:18:28 2016 +0100
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rB84ba6ef14ab0effa5c504932933d802c5522d5ee
Cleanup some more indentations...
===================================================================
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h
b/source/blender/editors/sculpt_paint/paint_intern.h
index 50e0061..865462f 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -163,34 +163,34 @@ typedef struct VPaintData {
} VPaintData;
typedef struct WPaintData {
- struct ViewContext vc;
- int *indexar;
+ struct ViewContext vc;
+ int *indexar;
- struct WeightPaintGroupData active, mirror;
+ struct WeightPaintGroupData active, mirror;
- void *vp_handle;
- struct DMCoNo *vertexcosnos;
+ void *vp_handle;
+ struct DMCoNo *vertexcosnos;
- float wpimat[3][3];
+ float wpimat[3][3];
- /* variables for auto normalize */
- const bool *vgroup_validmap; /* stores if vgroups tie to deforming bones or
not */
- const bool *lock_flags;
+ /* variables for auto normalize */
+ const bool *vgroup_validmap; /* stores if vgroups tie to deforming
bones or not */
+ const bool *lock_flags;
- /* variables for multipaint */
- const bool *defbase_sel; /* set of selected groups */
- int defbase_tot_sel; /* number of selected groups */
- bool do_multipaint; /* true if multipaint enabled and multiple
groups selected */
+ /* variables for multipaint */
+ const bool *defbase_sel; /* set of selected groups */
+ int defbase_tot_sel; /* number of selected groups */
+ bool do_multipaint; /* true if multipaint enabled and
multiple groups selected */
- /* variables for blur */
- struct {
- struct MeshElemMap *vmap;
- int *vmap_mem;
- } blur_data;
+ /* variables for blur */
+ struct {
+ struct MeshElemMap *vmap;
+ int *vmap_mem;
+ } blur_data;
- struct BLI_Stack *accumulate_stack; /* for reuse (WPaintDefer) */
+ struct BLI_Stack *accumulate_stack; /* for reuse (WPaintDefer) */
- int defbase_tot;
+ int defbase_tot;
} WPaintData;
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c
b/source/blender/editors/sculpt_paint/paint_vertex.c
index 0506606..187f4d3 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -2145,9 +2145,9 @@ static void calc_area_normal_and_center_task_cb(void
*userdata, const int n)
sculpt_brush_test_init(ss, &test);
- BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE)
- {
- const float *co;
+ BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd,
PBVH_ITER_UNIQUE)
+ {
+ const float *co;
co = vd.co;
@@ -3374,8 +3374,8 @@ static void vpaint_paint_leaves(bContext *C, Sculpt *sd,
VPaint *vp, VPaintData
}
static void vpaint_do_paint(
- bContext *C, Sculpt *sd, VPaint *vd, VPaintData *vpd, Object
*ob, Mesh *me,
- Brush *UNUSED(brush), const char symm, const int axis, const
int i, const float angle)
+ bContext *C, Sculpt *sd, VPaint *vd, VPaintData *vpd, Object *ob, Mesh
*me,
+ Brush *UNUSED(brush), const char symm, const int axis, const int i,
const float angle)
{
SculptSession *ss = ob->sculpt;
ss->cache->radial_symmetry_pass = i;
@@ -3400,7 +3400,9 @@ static void vpaint_do_paint(
MEM_freeN(nodes);
}
-static void vpaint_do_radial_symmetry(bContext *C, Sculpt *sd, VPaint *vd,
VPaintData *vpd, Object *ob, Mesh *me, Brush *brush, const char symm, const int
axis)
+static void vpaint_do_radial_symmetry(
+ bContext *C, Sculpt *sd, VPaint *vd, VPaintData *vpd, Object *ob, Mesh
*me,
+ Brush *brush, const char symm, const int axis)
{
for (int i = 1; i < vd->radial_symm[axis - 'X']; ++i) {
const float angle = (2.0 * M_PI) * i / vd->radial_symm[axis -
'X'];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
