Revision: 46541
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46541
Author: campbellbarton
Date: 2012-05-11 08:05:47 +0000 (Fri, 11 May 2012)
Log Message:
-----------
style cleanup: mainly sculpt/whitespace
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_multires.h
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/BKE_subsurf.h
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/paint.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/editors/include/ED_sculpt.h
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/modifiers/intern/MOD_multires.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
Modified: trunk/blender/source/blender/blenkernel/BKE_multires.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_multires.h 2012-05-11
07:03:04 UTC (rev 46540)
+++ trunk/blender/source/blender/blenkernel/BKE_multires.h 2012-05-11
08:05:47 UTC (rev 46541)
@@ -66,25 +66,25 @@
} MultiresFlags;
struct DerivedMesh *multires_make_derived_from_derived(struct DerivedMesh *dm,
-
struct MultiresModifierData *mmd,
-
struct Object *ob,
-
MultiresFlags flags);
+ struct
MultiresModifierData *mmd,
+ struct Object *ob,
+ MultiresFlags flags);
struct MultiresModifierData *find_multires_modifier_before(struct Scene *scene,
- struct ModifierData *lastmd);
+ struct ModifierData
*lastmd);
struct MultiresModifierData *get_multires_modifier(struct Scene *scene, struct
Object *ob, int use_first);
struct DerivedMesh *get_multires_dm(struct Scene *scene, struct
MultiresModifierData *mmd,
- struct Object *ob);
+ struct Object *ob);
void multiresModifier_del_levels(struct MultiresModifierData *, struct Object
*, int direction);
void multiresModifier_base_apply(struct MultiresModifierData *mmd, struct
Object *ob);
void multiresModifier_subdivide(struct MultiresModifierData *mmd, struct
Object *ob,
- int updateblock, int simple);
+ int updateblock, int simple);
int multiresModifier_reshape(struct Scene *scene, struct MultiresModifierData
*mmd,
- struct Object *dst, struct Object *src);
+ struct Object *dst, struct Object *src);
int multiresModifier_reshapeFromDM(struct Scene *scene, struct
MultiresModifierData *mmd,
- struct Object *ob, struct DerivedMesh *srcdm);
+ struct Object *ob, struct DerivedMesh
*srcdm);
int multiresModifier_reshapeFromDeformMod(struct Scene *scene, struct
MultiresModifierData *mmd,
- struct Object *ob, struct ModifierData *md);
+ struct Object *ob, struct
ModifierData *md);
void multires_stitch_grids(struct Object *);
Modified: trunk/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_paint.h 2012-05-11 07:03:04 UTC
(rev 46540)
+++ trunk/blender/source/blender/blenkernel/BKE_paint.h 2012-05-11 08:05:47 UTC
(rev 46541)
@@ -67,11 +67,11 @@
/* partial visibility */
int paint_is_face_hidden(const struct MFace *f, const struct MVert *mvert);
int paint_is_grid_face_hidden(const unsigned int *grid_hidden,
- int gridsize, int x,
int y);
+ int gridsize, int x, int y);
/* paint masks */
float paint_grid_paint_mask(const struct GridPaintMask *gpm, unsigned level,
- unsigned x, unsigned y);
+ unsigned x, unsigned y);
/* Session data (mode-specific) */
Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-05-11
07:03:04 UTC (rev 46540)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-05-11
08:05:47 UTC (rev 46541)
@@ -64,10 +64,10 @@
} SubsurfFlags;
struct DerivedMesh *subsurf_make_derived_from_derived(
- struct DerivedMesh *dm,
- struct SubsurfModifierData *smd,
- float (*vertCos)[3],
- SubsurfFlags flags);
+ struct DerivedMesh *dm,
+ struct SubsurfModifierData *smd,
+ float (*vertCos)[3],
+ SubsurfFlags flags);
void subsurf_calculate_limit_positions(struct Mesh *me, float
(*positions_r)[3]);
@@ -79,13 +79,13 @@
int ccg_factor(int low_level, int high_level);
void subsurf_copy_grid_hidden(struct DerivedMesh *dm,
- const struct MPoly
*mpoly,
- struct MVert *mvert,
- const struct MDisps
*mdisps);
+ const struct MPoly *mpoly,
+ struct MVert *mvert,
+ const struct MDisps *mdisps);
void subsurf_copy_grid_paint_mask(struct DerivedMesh *dm,
- const struct
MPoly *mpoly, float *paint_mask,
- const struct
GridPaintMask *grid_paint_mask);
+ const struct MPoly *mpoly, float *paint_mask,
+ const struct GridPaintMask *grid_paint_mask);
typedef enum MultiresModifiedFlags {
/* indicates the grids have been sculpted on, so MDisps
@@ -104,10 +104,10 @@
int freeSS;
int drawInteriorEdges, useSubsurfUv;
- struct {int startVert; struct CCGVert *vert;} *vertMap;
- struct {int startVert; int startEdge; struct CCGEdge *edge;} *edgeMap;
+ struct {int startVert; struct CCGVert *vert; } *vertMap;
+ struct {int startVert; int startEdge; struct CCGEdge *edge; } *edgeMap;
struct {int startVert; int startEdge;
- int startFace; struct CCGFace *face;} *faceMap;
+ int startFace; struct CCGFace *face; } *faceMap;
short *edgeFlags;
struct DMFlagMat *faceFlags;
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-11 07:03:04 UTC (rev 46540)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-11 08:05:47 UTC (rev 46541)
@@ -245,7 +245,7 @@
return cddm->mvert == me->mvert || ob->sculpt->kb;
}
-static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
+static PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
{
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-05-11
07:03:04 UTC (rev 46540)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-05-11
08:05:47 UTC (rev 46541)
@@ -97,10 +97,10 @@
CustomData_external_remove(&me->ldata, &me->id,
CD_MDISPS, me->totloop);
CustomData_free_layer_active(&me->ldata, CD_MDISPS,
-
me->totloop);
+ me->totloop);
CustomData_free_layer_active(&me->ldata, CD_GRID_PAINT_MASK,
-
me->totloop);
+ me->totloop);
}
}
@@ -108,7 +108,7 @@
static BLI_bitmap multires_mdisps_upsample_hidden(BLI_bitmap lo_hidden,
int lo_level,
int hi_level,
-
+
/* assumed to be at hi_level
(or
* null) */
BLI_bitmap prev_hidden)
@@ -585,8 +585,8 @@
for (j = 0, y = 0; y < keyB->grid_size; y++)
for (x = 0; x < keyB->grid_size; x++, j++)
memcpy(CCG_elem_offset_co(keyA, gridA, y * skip
* keyA->grid_size + x * skip),
- CCG_elem_offset_co(keyB, gridB, j),
- sizeof(float) * keyA->num_layers);
+ CCG_elem_offset_co(keyB, gridB, j),
+ sizeof(float) * keyA->num_layers);
}
else {
skip = (keyB->grid_size - 1) / (keyA->grid_size - 1);
@@ -594,8 +594,8 @@
for (j = 0, y = 0; y < keyA->grid_size; y++)
for (x = 0; x < keyA->grid_size; x++, j++)
memcpy(CCG_elem_offset_co(keyA, gridA, j),
- CCG_elem_offset_co(keyB, gridB, y *
skip * keyB->grid_size + x*skip),
- sizeof(float) * keyA->num_layers);
+ CCG_elem_offset_co(keyB, gridB, y * skip
* keyB->grid_size + x * skip),
+ sizeof(float) * keyA->num_layers);
}
}
@@ -606,13 +606,13 @@
if (level < gpm->level) {
int gridsize = ccg_gridsize(level);
float *data = MEM_callocN(sizeof(float) * gridsize * gridsize,
-
"multires_grid_paint_mask_downsample");
+
"multires_grid_paint_mask_downsample");
int x, y;
for (y = 0; y < gridsize; y++) {
for (x = 0; x < gridsize; x++) {
data[y * gridsize + x] =
- paint_grid_paint_mask(gpm, level, x, y);
+ paint_grid_paint_mask(gpm, level, x, y);
}
}
@@ -905,7 +905,7 @@
cddm = CDDM_from_mesh(me, NULL);
DM_set_only_copy(cddm, CD_MASK_BAREMESH);
highdm = subsurf_dm_create_local(ob, cddm, totlvl, simple, 0,
mmd->flags & eMultiresModifierFlag_PlainUv, TRUE);
- ss = ((CCGDerivedMesh*)highdm)->ss;
+ ss = ((CCGDerivedMesh *)highdm)->ss;
/* create multires DM from original mesh at low level */
lowdm = multires_dm_create_local(ob, cddm, lvl, lvl, simple,
TRUE);
@@ -924,7 +924,7 @@
for (i = 0; i < numGrids; ++i) {
/* backup subsurf grids */
subGridData[i] = MEM_callocN(highGridKey.elem_size *
highGridSize * highGridSize, "subGridData");
- memcpy(subGridData[i], highGridData[i],
highGridKey.elem_size*highGridSize * highGridSize);
+ memcpy(subGridData[i], highGridData[i],
highGridKey.elem_size * highGridSize * highGridSize);
/* overwrite with current displaced grids */
multires_copy_dm_grid(highGridData[i], lowGridData[i],
&highGridKey, &lowGridKey);
@@ -1022,7 +1022,7 @@
gridData = dm->getGridData(dm);
gridOffset = dm->getGridOffset(dm);
dm->getGridKey(dm, &key);
- subGridData = (oldGridData) ? oldGridData: gridData;
+ subGridData = (oldGridData) ? oldGridData : gridData;
dGridSize = multires_side_tot[totlvl];
dSkip = (dGridSize - 1) / (gridSize - 1);
@@ -1069,7 +1069,7 @@
float *co = CCG_grid_elem_co(&key,
grid, x, y);
float *sco = CCG_grid_elem_co(&key,
subgrid, x, y);
float *no = CCG_grid_elem_no(&key,
subgrid, x, y);
- float *data =
dispgrid[dGridSize*y*dSkip + x*dSkip];
+ float *data = dispgrid[dGridSize * y *
dSkip + x * dSkip];
float mat[3][3], tx[3], ty[3], disp[3],
d[3], mask;
/* construct tangent space matrix */
@@ -1110,21 +1110,21 @@
if (gpm) {
switch (op) {
- case APPLY_DISPLACEMENTS:
- /* Copy mask from gpm
to DM */
-
*CCG_grid_elem_mask(&key, grid, x, y) =
-
paint_grid_paint_mask(gpm, key.level, x, y);
- break;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
