Revision: 46581
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46581
Author: campbellbarton
Date: 2012-05-12 19:18:02 +0000 (Sat, 12 May 2012)
Log Message:
-----------
style cleanup: blenkernel
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-05-12 17:43:56 UTC (rev 46580)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-05-12 19:18:02 UTC (rev 46581)
@@ -95,7 +95,7 @@
if (!mvert) {
mvert = CustomData_add_layer(&dm->vertData, CD_MVERT,
CD_CALLOC, NULL,
- dm->getNumVerts(dm));
+ dm->getNumVerts(dm));
CustomData_set_layer_flag(&dm->vertData, CD_MVERT,
CD_FLAG_TEMPORARY);
dm->copyVertArray(dm, mvert);
}
@@ -109,7 +109,7 @@
if (!medge) {
medge = CustomData_add_layer(&dm->edgeData, CD_MEDGE,
CD_CALLOC, NULL,
- dm->getNumEdges(dm));
+ dm->getNumEdges(dm));
CustomData_set_layer_flag(&dm->edgeData, CD_MEDGE,
CD_FLAG_TEMPORARY);
dm->copyEdgeArray(dm, medge);
}
@@ -146,7 +146,7 @@
if (!mloop) {
mloop = CustomData_add_layer(&dm->loopData, CD_MLOOP,
CD_CALLOC, NULL,
- dm->getNumLoops(dm));
+ dm->getNumLoops(dm));
CustomData_set_layer_flag(&dm->loopData, CD_MLOOP,
CD_FLAG_TEMPORARY);
dm->copyLoopArray(dm, mloop);
}
@@ -160,7 +160,7 @@
if (!mpoly) {
mpoly = CustomData_add_layer(&dm->polyData, CD_MPOLY,
CD_CALLOC, NULL,
- dm->getNumPolys(dm));
+ dm->getNumPolys(dm));
CustomData_set_layer_flag(&dm->polyData, CD_MPOLY,
CD_FLAG_TEMPORARY);
dm->copyPolyArray(dm, mpoly);
}
@@ -171,7 +171,7 @@
static MVert *dm_dupVertArray(DerivedMesh *dm)
{
MVert *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumVerts(dm),
- "dm_dupVertArray tmp");
+ "dm_dupVertArray tmp");
if (tmp) dm->copyVertArray(dm, tmp);
@@ -181,7 +181,7 @@
static MEdge *dm_dupEdgeArray(DerivedMesh *dm)
{
MEdge *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumEdges(dm),
- "dm_dupEdgeArray tmp");
+ "dm_dupEdgeArray tmp");
if (tmp) dm->copyEdgeArray(dm, tmp);
@@ -191,7 +191,7 @@
static MFace *dm_dupFaceArray(DerivedMesh *dm)
{
MFace *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumTessFaces(dm),
- "dm_dupFaceArray tmp");
+ "dm_dupFaceArray tmp");
if (tmp) dm->copyTessFaceArray(dm, tmp);
@@ -201,7 +201,7 @@
static MLoop *dm_dupLoopArray(DerivedMesh *dm)
{
MLoop *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumLoops(dm),
- "dm_dupLoopArray tmp");
+ "dm_dupLoopArray tmp");
if (tmp) dm->copyLoopArray(dm, tmp);
@@ -211,7 +211,7 @@
static MPoly *dm_dupPolyArray(DerivedMesh *dm)
{
MPoly *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumPolys(dm),
- "dm_dupPolyArray tmp");
+ "dm_dupPolyArray tmp");
if (tmp) dm->copyPolyArray(dm, tmp);
@@ -295,11 +295,11 @@
int numLoops, int numPolys)
{
CustomData_copy(&source->vertData, &dm->vertData, CD_MASK_DERIVEDMESH,
- CD_CALLOC, numVerts);
+ CD_CALLOC, numVerts);
CustomData_copy(&source->edgeData, &dm->edgeData, CD_MASK_DERIVEDMESH,
- CD_CALLOC, numEdges);
+ CD_CALLOC, numEdges);
CustomData_copy(&source->faceData, &dm->faceData, CD_MASK_DERIVEDMESH,
- CD_CALLOC, numTessFaces);
+ CD_CALLOC, numTessFaces);
CustomData_copy(&source->loopData, &dm->loopData, CD_MASK_DERIVEDMESH,
CD_CALLOC, numLoops);
CustomData_copy(&source->polyData, &dm->polyData, CD_MASK_DERIVEDMESH,
@@ -463,7 +463,7 @@
/* dm might depend on me, so we need to do everything with a local copy
*/
Mesh tmp = *me;
int totvert, totedge /*, totface */ /* UNUSED */, totloop, totpoly;
- int did_shapekeys=0;
+ int did_shapekeys = 0;
memset(&tmp.vdata, 0, sizeof(tmp.vdata));
memset(&tmp.edata, 0, sizeof(tmp.edata));
@@ -486,13 +486,13 @@
int uid;
if (ob) {
- kb = BLI_findlink(&me->key->block, ob->shapenr-1);
+ kb = BLI_findlink(&me->key->block, ob->shapenr - 1);
if (kb) {
uid = kb->uid;
}
else {
printf("%s: error - could not find active
shapekey %d!\n",
- __func__, ob->shapenr-1);
+ __func__, ob->shapenr - 1);
uid = INT_MAX;
}
@@ -558,16 +558,16 @@
float *fp;
MVert *mvert;
- if (totvert==0 || me->totvert==0 || me->totvert!=totvert) return;
+ if (totvert == 0 || me->totvert == 0 || me->totvert != totvert) return;
if (kb->data) MEM_freeN(kb->data);
- kb->data= MEM_callocN(me->key->elemsize*me->totvert, "kb->data");
- kb->totelem= totvert;
+ kb->data = MEM_callocN(me->key->elemsize * me->totvert, "kb->data");
+ kb->totelem = totvert;
- fp= kb->data;
- mvert=dm->getVertDataArray(dm, CD_MVERT);
+ fp = kb->data;
+ mvert = dm->getVertDataArray(dm, CD_MVERT);
- for (a=0; a<kb->totelem; a++, fp+=3, mvert++) {
+ for (a = 0; a < kb->totelem; a++, fp += 3, mvert++) {
copy_v3_v3(fp, mvert->co);
}
}
@@ -669,24 +669,24 @@
}
void DM_copy_vert_data(DerivedMesh *source, DerivedMesh *dest,
- int source_index, int dest_index,
int count)
+ int source_index, int dest_index, int count)
{
CustomData_copy_data(&source->vertData, &dest->vertData,
- source_index, dest_index,
count);
+ source_index, dest_index, count);
}
void DM_copy_edge_data(DerivedMesh *source, DerivedMesh *dest,
- int source_index, int dest_index,
int count)
+ int source_index, int dest_index, int count)
{
CustomData_copy_data(&source->edgeData, &dest->edgeData,
- source_index, dest_index,
count);
+ source_index, dest_index, count);
}
void DM_copy_tessface_data(DerivedMesh *source, DerivedMesh *dest,
- int source_index, int dest_index,
int count)
+ int source_index, int dest_index, int count)
{
CustomData_copy_data(&source->faceData, &dest->faceData,
- source_index, dest_index,
count);
+ source_index, dest_index, count);
}
void DM_copy_loop_data(DerivedMesh *source, DerivedMesh *dest,
@@ -729,29 +729,29 @@
}
void DM_interp_vert_data(DerivedMesh *source, DerivedMesh *dest,
- int *src_indices, float
*weights,
- int count, int dest_index)
+ int *src_indices, float *weights,
+ int count, int dest_index)
{
CustomData_interp(&source->vertData, &dest->vertData, src_indices,
- weights, NULL, count, dest_index);
+ weights, NULL, count, dest_index);
}
void DM_interp_edge_data(DerivedMesh *source, DerivedMesh *dest,
- int *src_indices,
- float *weights, EdgeVertWeight
*vert_weights,
- int count, int dest_index)
+ int *src_indices,
+ float *weights, EdgeVertWeight *vert_weights,
+ int count, int dest_index)
{
CustomData_interp(&source->edgeData, &dest->edgeData, src_indices,
- weights, (float*)vert_weights, count,
dest_index);
+ weights, (float *)vert_weights, count, dest_index);
}
void DM_interp_tessface_data(DerivedMesh *source, DerivedMesh *dest,
- int *src_indices,
- float *weights, FaceVertWeight
*vert_weights,
- int count, int dest_index)
+ int *src_indices,
+ float *weights, FaceVertWeight *vert_weights,
+ int count, int dest_index)
{
CustomData_interp(&source->faceData, &dest->faceData, src_indices,
- weights, (float*)vert_weights, count,
dest_index);
+ weights, (float *)vert_weights, count, dest_index);
}
void DM_swap_tessface_data(DerivedMesh *dm, int index, const int
*corner_indices)
@@ -801,16 +801,16 @@
DerivedMesh *dm;
KeyBlock *kb;
- md->scene= scene;
+ md->scene = scene;
- if (!(md->mode&eModifierMode_Realtime)) return NULL;
+ if (!(md->mode & eModifierMode_Realtime)) return NULL;
if (mti->isDisabled && mti->isDisabled(md, 0)) return NULL;
- if (build_shapekey_layers && me->key && (kb =
BLI_findlink(&me->key->block, ob->shapenr-1))) {
+ if (build_shapekey_layers && me->key && (kb =
BLI_findlink(&me->key->block, ob->shapenr - 1))) {
key_to_mesh(kb, me);
}
- if (mti->type==eModifierTypeType_OnlyDeform) {
+ if (mti->type == eModifierTypeType_OnlyDeform) {
int numVerts;
float (*deformedVerts)[3] = mesh_getVertexCos(me, &numVerts);
@@ -846,13 +846,13 @@
/* these may not really be the orco's, but it's only for preview.
* could be solver better once, but isn't simple */
- totvert= em->bm->totvert;
+ totvert = em->bm->totvert;
- orco = MEM_mallocN(sizeof(float)*3*totvert, "BMEditMesh Orco");
+ orco = MEM_mallocN(sizeof(float) * 3 * totvert, "BMEditMesh Orco");
eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
- for (a=0; eve; eve=BM_iter_step(&iter), a+=3) {
- copy_v3_v3(orco+a, eve->co);
+ for (a = 0; eve; eve = BM_iter_step(&iter), a += 3) {
+ copy_v3_v3(orco + a, eve->co);
}
return orco;
@@ -861,11 +861,11 @@
/* orco custom data layer */
static void *get_orco_coords_dm(Object *ob, BMEditMesh *em, int layer, int
*free)
{
- *free= 0;
+ *free = 0;
if (layer == CD_ORCO) {
/* get original coordinates */
- *free= 1;
+ *free = 1;
if (em)
return (float(*)[3])get_editbmesh_orco_verts(em);
@@ -877,7 +877,7 @@
* by a more flexible customdata system, but not simple */
if (!em) {
ClothModifierData *clmd = (ClothModifierData
*)modifiers_findByType(ob, eModifierType_Cloth);
- KeyBlock *kb= key_get_keyblock(ob_get_key(ob),
clmd->sim_parms->shapekey_rest);
+ KeyBlock *kb = key_get_keyblock(ob_get_key(ob),
clmd->sim_parms->shapekey_rest);
if (kb->data)
return kb->data;
@@ -895,10 +895,10 @@
float (*orco)[3];
int free;
- if (em) dm= CDDM_from_BMEditMesh(em, me, FALSE, FALSE);
- else dm= CDDM_from_mesh(me, ob);
+ if (em) dm = CDDM_from_BMEditMesh(em, me, FALSE, FALSE);
+ else dm = CDDM_from_mesh(me, ob);
- orco= get_orco_coords_dm(ob, em, layer, &free);
+ orco = get_orco_coords_dm(ob, em, layer, &free);
if (orco) {
CDDM_apply_vert_coords(dm, orco);
@@ -911,16 +911,16 @@
}
static void add_orco_dm(Object *ob, BMEditMesh *em, DerivedMesh *dm,
- DerivedMesh *orcodm, int layer)
+ DerivedMesh *orcodm, int layer)
{
float (*orco)[3], (*layerorco)[3];
int totvert, free;
- totvert= dm->getNumVerts(dm);
+ totvert = dm->getNumVerts(dm);
if (orcodm) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
