[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51581] trunk/blender: code cleanup: some edits for unused vars in recent smooth addition and some style edits.
Campbell Barton
ideasman42 at gmail.com
Wed Oct 24 13:31:58 CEST 2012
Revision: 51581
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51581
Author: campbellbarton
Date: 2012-10-24 11:31:57 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
code cleanup: some edits for unused vars in recent smooth addition and some style edits.
Modified Paths:
--------------
trunk/blender/intern/smoke/intern/smoke_API.cpp
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/intern/smoke/intern/smoke_API.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/smoke_API.cpp 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/intern/smoke/intern/smoke_API.cpp 2012-10-24 11:31:57 UTC (rev 51581)
@@ -46,7 +46,7 @@
extern "C" WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, int use_fire, int use_colors)
{
- if(amplify)
+ if (amplify)
return new WTURBULENCE(res[0],res[1],res[2], amplify, noisetype, use_fire, use_colors);
else
return NULL;
@@ -105,8 +105,7 @@
static void data_dissolve(float *density, float *heat, float *r, float *g, float *b, int total_cells, int speed, int log)
{
- if(log)
- {
+ if (log) {
/* max density/speed = dydx */
float fac = 1.0f - (1.0f / (float)speed);
@@ -138,14 +137,14 @@
float d = density[i];
/* density */
density[i] -= dydx;
- if(density[i] < 0.0f)
+ if (density[i] < 0.0f)
density[i] = 0.0f;
/* heat */
if (heat) {
- if(abs(heat[i]) < dydx) heat[i] = 0.0f;
- else if (heat[i]>0.0f) heat[i] -= dydx;
- else if (heat[i]<0.0f) heat[i] += dydx;
+ if (abs(heat[i]) < dydx) heat[i] = 0.0f;
+ else if (heat[i] > 0.0f) heat[i] -= dydx;
+ else if (heat[i] < 0.0f) heat[i] += dydx;
}
/* color */
@@ -190,9 +189,9 @@
}
extern "C" void smoke_turbulence_export(WTURBULENCE *wt, float **dens, float **react, float **flame, float **fuel,
- float **r, float **g, float **b , float **tcu, float **tcv, float **tcw)
+ float **r, float **g, float **b , float **tcu, float **tcv, float **tcw)
{
- if(!wt)
+ if (!wt)
return;
*dens = wt->_densityBig;
@@ -484,4 +483,4 @@
if (wt) {
wt->initColors(init_r, init_g, init_b);
}
-}
\ No newline at end of file
+}
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-10-24 11:31:57 UTC (rev 51581)
@@ -1832,9 +1832,11 @@
}
if (imf->depth == R_IMF_CHAN_DEPTH_16) {
ibuf->ftype |= CINEON_16BIT;
- } else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
+ }
+ else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
ibuf->ftype |= CINEON_12BIT;
- } else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
+ }
+ else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
ibuf->ftype |= CINEON_10BIT;
}
}
@@ -1845,9 +1847,11 @@
}
if (imf->depth == R_IMF_CHAN_DEPTH_16) {
ibuf->ftype |= CINEON_16BIT;
- } else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
+ }
+ else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
ibuf->ftype |= CINEON_12BIT;
- } else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
+ }
+ else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
ibuf->ftype |= CINEON_10BIT;
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c 2012-10-24 11:31:57 UTC (rev 51581)
@@ -69,7 +69,7 @@
};
typedef struct BLaplacianSystem LaplacianSystem;
-static float compute_volume(BMesh *bm, BMOperator *op);
+static float compute_volume(BMesh *bm);
static float cotan_weight(float *v1, float *v2, float *v3);
static int vert_is_boundary(BMVert *v);
static LaplacianSystem * init_laplacian_system( int a_numEdges, int a_numFaces, int a_numVerts);
@@ -78,7 +78,7 @@
static void delete_void_pointer(void * data);
static void fill_laplacian_matrix(LaplacianSystem * sys);
static void memset_laplacian_system(LaplacianSystem *sys, int val);
-static void validate_solution(LaplacianSystem * sys, int usex, int usey, int usez, float lambda, float lambda_border, int volumepreservation);
+static void validate_solution(LaplacianSystem * sys, int usex, int usey, int usez, int volumepreservation);
static void volume_preservation(BMesh *bm, BMOperator *op, float vini, float vend, int usex, int usey, int usez);
static void delete_void_pointer(void * data)
@@ -230,7 +230,8 @@
if (has_4_vert) {
areaf = area_quad_v3(v1, v2, v3, v4);
- } else {
+ }
+ else {
areaf = area_tri_v3(v1, v2, v3);
}
@@ -270,7 +271,8 @@
sys->vweights[idv1] += (w2 + w3 + w4) / 4.0f;
}
- } else {
+ }
+ else {
i = BM_elem_index_get(f);
w1 = cotan_weight(v1, v2, v3);
@@ -341,7 +343,8 @@
nlMatrixAdd(idv1, idv4, w4 * sys->vweights[idv1]);
}
}
- } else {
+ }
+ else {
idv1 = BM_elem_index_get(vf[0]);
idv2 = BM_elem_index_get(vf[1]);
idv3 = BM_elem_index_get(vf[2]);
@@ -412,7 +415,7 @@
return 0;
}
-static float compute_volume(BMesh *bm, BMOperator *op)
+static float compute_volume(BMesh *bm)
{
float vol = 0.0f;
float x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4;
@@ -474,7 +477,7 @@
}
}
-static void validate_solution(LaplacianSystem * sys, int usex, int usey, int usez, float lambda, float lambda_border, int volumepreservation)
+static void validate_solution(LaplacianSystem * sys, int usex, int usey, int usez, int volumepreservation)
{
int m_vertex_id;
float leni, lene;
@@ -506,7 +509,7 @@
}
if (volumepreservation) {
- vini = compute_volume(sys->bm, sys->op);
+ vini = compute_volume(sys->bm);
}
BMO_ITER (v, &siter, sys->bm, sys->op, "verts", BM_VERT) {
m_vertex_id = BM_elem_index_get(v);
@@ -523,7 +526,7 @@
}
}
if (volumepreservation) {
- vend = compute_volume(sys->bm, sys->op);
+ vend = compute_volume(sys->bm);
volume_preservation(sys->bm, sys->op, vini, vend, usex, usey, usez);
}
@@ -587,16 +590,18 @@
i = m_vertex_id;
if (sys->zerola[i] == 0) {
w = sys->vweights[i] * sys->ring_areas[i];
- sys->vweights[i] = (w == 0.0f) ? 0.0f : - lambda / (4.0f * w);
+ sys->vweights[i] = (w == 0.0f) ? 0.0f : -lambda / (4.0f * w);
w = sys->vlengths[i];
- sys->vlengths[i] = (w == 0.0f) ? 0.0f : - lambda_border * 2.0f / w;
+ sys->vlengths[i] = (w == 0.0f) ? 0.0f : -lambda_border * 2.0f / w;
if (!vert_is_boundary(v)) {
nlMatrixAdd(i, i, 1.0f + lambda / (4.0f * sys->ring_areas[i]));
- } else {
+ }
+ else {
nlMatrixAdd(i, i, 1.0f + lambda_border * 2.0f);
}
- } else {
+ }
+ else {
nlMatrixAdd(i, i, 1.0f);
}
}
@@ -606,7 +611,7 @@
nlEnd(NL_SYSTEM);
if (nlSolveAdvanced(NULL, NL_TRUE) ) {
- validate_solution(sys, usex, usey, usez, lambda, lambda_border, volumepreservation);
+ validate_solution(sys, usex, usey, usez, volumepreservation);
}
delete_laplacian_system(sys);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-10-24 11:31:57 UTC (rev 51581)
@@ -1672,15 +1672,15 @@
BMEditMesh *em = BMEdit_FromObject(obedit);
int usex = TRUE, usey = TRUE, usez = TRUE, volume_preservation = TRUE;
int i, repeat;
- float lambda = 0.1f;
- float lambda_border = 0.1f;
+ float lambda;
+ float lambda_border;
BMIter fiter;
BMFace *f;
/* Check if select faces are triangles */
BM_ITER_MESH (f, &fiter, em->bm, BM_FACES_OF_MESH) {
if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
- if(f->len > 4) {
+ if (f->len > 4) {
BKE_report(op->reports, RPT_WARNING, "Selected faces must be triangles or quads");
return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-10-24 11:31:57 UTC (rev 51581)
@@ -2378,11 +2378,12 @@
if (!ED_space_image_show_uvedit(sima, t->obedit)) return;
/* count */
- if(propconnected) {
+ if (propconnected) {
/* create element map with island information */
if (ts->uv_flag & UV_SYNC_SELECTION) {
elementmap = EDBM_uv_element_map_create (em, FALSE, TRUE);
- } else {
+ }
+ else {
elementmap = EDBM_uv_element_map_create (em, TRUE, TRUE);
}
island_enabled = MEM_callocN(sizeof(*island_enabled) * elementmap->totalIslands, "TransIslandData(UV Editing)");
@@ -2401,7 +2402,7 @@
if (uvedit_uv_select_test(em, scene, l)) {
countsel++;
- if(propconnected) {
+ if (propconnected) {
UvElement *element = ED_uv_element_get(elementmap, efa, l);
island_enabled[element->island] = TRUE;
}
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2012-10-24 11:31:57 UTC (rev 51581)
@@ -3384,13 +3384,13 @@
" DynamicArray(const DynamicArray<T>& other) { copy_from(other); }\n"
" const DynamicArray<T>& operator=(const DynamicArray<T>& other) { copy_from(other); return *this; }\n"
"\n"
-" ~DynamicArray() { if(data) free(data); }\n"
+" ~DynamicArray() { if (data) free(data); }\n"
"\n"
" operator T*() { return data; }\n"
"\n"
"protected:\n"
" void copy_from(const DynamicArray<T>& other) {\n"
-" if(data) free(data);\n"
+" if (data) free(data);\n"
" data = (float*)malloc(sizeof(T) * other.length);\n"
" memcpy(data, other.data, sizeof(T) * other.length);\n"
" length = other.length;\n"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c 2012-10-24 11:13:43 UTC (rev 51580)
+++ trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c 2012-10-24 11:31:57 UTC (rev 51581)
@@ -56,21 +56,21 @@
#define MOD_LAPLACIANSMOOTH_MIN_EDGE_PERCENTAGE 0.02
struct BLaplacianSystem {
- float *eweights; /* Length weights per Edge */
+ float *eweights; /* Length weights per Edge */
float (*fweights)[3]; /* Cotangent weights per face */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list