[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46378] trunk/blender/source/blender: Style cleanup of own modules using style checker from Campbell.
Sergey Sharybin
sergey.vfx at gmail.com
Mon May 7 10:54:00 CEST 2012
Revision: 46378
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46378
Author: nazgul
Date: 2012-05-07 08:53:59 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Style cleanup of own modules using style checker from Campbell.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_ops.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
trunk/blender/source/blender/editors/space_clip/clip_utils.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-07 06:58:03 UTC (rev 46377)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-07 08:53:59 UTC (rev 46378)
@@ -32,7 +32,7 @@
#include <math.h> // floor
#include <string.h>
-#include <stdlib.h>
+#include <stdlib.h>
#include "MEM_guardedalloc.h"
@@ -42,24 +42,24 @@
#include "BLI_utildefines.h"
#include "BLI_ghash.h"
-#include "DNA_curve_types.h"
-#include "DNA_material_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_material_types.h"
/* for dereferencing pointers */
-#include "DNA_key_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_vfont_types.h"
+#include "DNA_key_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_vfont_types.h"
#include "DNA_object_types.h"
#include "BKE_animsys.h"
-#include "BKE_anim.h"
-#include "BKE_curve.h"
-#include "BKE_displist.h"
-#include "BKE_font.h"
-#include "BKE_global.h"
-#include "BKE_key.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
+#include "BKE_anim.h"
+#include "BKE_curve.h"
+#include "BKE_displist.h"
+#include "BKE_font.h"
+#include "BKE_global.h"
+#include "BKE_key.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
#include "BKE_object.h"
#include "BKE_material.h"
@@ -73,24 +73,29 @@
void BKE_curve_unlink(Curve *cu)
{
int a;
-
+
for (a = 0; a < cu->totcol; a++) {
if (cu->mat[a]) cu->mat[a]->id.us--;
cu->mat[a] = NULL;
}
- if (cu->vfont) cu->vfont->id.us--;
+ if (cu->vfont)
+ cu->vfont->id.us--;
cu->vfont = NULL;
- if (cu->vfontb) cu->vfontb->id.us--;
+ if (cu->vfontb)
+ cu->vfontb->id.us--;
cu->vfontb = NULL;
- if (cu->vfonti) cu->vfonti->id.us--;
+ if (cu->vfonti)
+ cu->vfonti->id.us--;
cu->vfonti = NULL;
- if (cu->vfontbi) cu->vfontbi->id.us--;
+ if (cu->vfontbi)
+ cu->vfontbi->id.us--;
cu->vfontbi = NULL;
-
- if (cu->key) cu->key->id.us--;
+
+ if (cu->key)
+ cu->key->id.us--;
cu->key = NULL;
}
@@ -99,14 +104,20 @@
{
if (cu->editfont) {
EditFont *ef = cu->editfont;
-
- if (ef->oldstr) MEM_freeN(ef->oldstr);
- if (ef->oldstrinfo) MEM_freeN(ef->oldstrinfo);
- if (ef->textbuf) MEM_freeN(ef->textbuf);
- if (ef->textbufinfo) MEM_freeN(ef->textbufinfo);
- if (ef->copybuf) MEM_freeN(ef->copybuf);
- if (ef->copybufinfo) MEM_freeN(ef->copybufinfo);
-
+
+ if (ef->oldstr)
+ MEM_freeN(ef->oldstr);
+ if (ef->oldstrinfo)
+ MEM_freeN(ef->oldstrinfo);
+ if (ef->textbuf)
+ MEM_freeN(ef->textbuf);
+ if (ef->textbufinfo)
+ MEM_freeN(ef->textbufinfo);
+ if (ef->copybuf)
+ MEM_freeN(ef->copybuf);
+ if (ef->copybufinfo)
+ MEM_freeN(ef->copybufinfo);
+
MEM_freeN(ef);
cu->editfont = NULL;
}
@@ -142,13 +153,19 @@
BKE_curve_editNurb_free(cu);
BKE_curve_unlink(cu);
BKE_free_animdata((ID *)cu);
-
- if (cu->mat) MEM_freeN(cu->mat);
- if (cu->str) MEM_freeN(cu->str);
- if (cu->strinfo) MEM_freeN(cu->strinfo);
- if (cu->bb) MEM_freeN(cu->bb);
- if (cu->path) free_path(cu->path);
- if (cu->tb) MEM_freeN(cu->tb);
+
+ if (cu->mat)
+ MEM_freeN(cu->mat);
+ if (cu->str)
+ MEM_freeN(cu->str);
+ if (cu->strinfo)
+ MEM_freeN(cu->strinfo);
+ if (cu->bb)
+ MEM_freeN(cu->bb);
+ if (cu->path)
+ free_path(cu->path);
+ if (cu->tb)
+ MEM_freeN(cu->tb);
}
Curve *BKE_curve_add(const char *name, int type)
@@ -164,10 +181,11 @@
cu->wordspace = 1.0;
cu->spacing = cu->linedist = 1.0;
cu->fsize = 1.0;
- cu->ulheight = 0.05;
+ cu->ulheight = 0.05;
cu->texflag = CU_AUTOSPACE;
cu->smallcaps_scale = 0.75f;
- cu->twist_mode = CU_TWIST_MINIMUM; // XXX: this one seems to be the best one in most cases, at least for curve deform...
+ /* XXX: this one seems to be the best one in most cases, at least for curve deform... */
+ cu->twist_mode = CU_TWIST_MINIMUM;
cu->type = type;
cu->bevfac1 = 0.0f;
cu->bevfac2 = 1.0f;
@@ -185,7 +203,7 @@
cu->tb = MEM_callocN(MAXTEXTBOX * sizeof(TextBox), "textbox");
cu->tb[0].w = cu->tb[0].h = 0.0;
}
-
+
return cu;
}
@@ -193,7 +211,7 @@
{
Curve *cun;
int a;
-
+
cun = BKE_libblock_copy(&cu->id);
cun->nurb.first = cun->nurb.last = NULL;
BKE_nurbList_duplicate(&(cun->nurb), &(cu->nurb));
@@ -202,7 +220,7 @@
for (a = 0; a < cun->totcol; a++) {
id_us_plus((ID *)cun->mat[a]);
}
-
+
cun->str = MEM_dupallocN(cu->str);
cun->strinfo = MEM_dupallocN(cu->strinfo);
cun->tb = MEM_dupallocN(cu->tb);
@@ -225,20 +243,20 @@
#endif // XXX old animation system
id_us_plus((ID *)cun->vfont);
- id_us_plus((ID *)cun->vfontb);
+ id_us_plus((ID *)cun->vfontb);
id_us_plus((ID *)cun->vfonti);
id_us_plus((ID *)cun->vfontbi);
-
+
return cun;
}
static void extern_local_curve(Curve *cu)
-{
+{
id_lib_extern((ID *)cu->vfont);
- id_lib_extern((ID *)cu->vfontb);
+ id_lib_extern((ID *)cu->vfontb);
id_lib_extern((ID *)cu->vfonti);
id_lib_extern((ID *)cu->vfontbi);
-
+
if (cu->mat) {
extern_local_matarar(cu->mat, cu->totcol);
}
@@ -249,14 +267,15 @@
Main *bmain = G.main;
Object *ob;
int is_local = FALSE, is_lib = FALSE;
-
+
/* - when there are only lib users: don't do
* - when there are only local users: set flag
* - mixed: do a copy
*/
-
- if (cu->id.lib == NULL) return;
+ if (cu->id.lib == NULL)
+ return;
+
if (cu->id.us == 1) {
id_clear_lib_data(bmain, &cu->id);
extern_local_curve(cu);
@@ -360,15 +379,15 @@
BoundBox *bb;
float *fp, min[3], max[3];
int tot, doit = 0;
-
- if (cu->bb == NULL) cu->bb = MEM_callocN(sizeof(BoundBox), "boundbox");
+
+ if (cu->bb == NULL)
+ cu->bb = MEM_callocN(sizeof(BoundBox), "boundbox");
bb = cu->bb;
-
+
INIT_MINMAX(min, max);
dl = cu->disp.first;
while (dl) {
-
tot = ELEM(dl->type, DL_INDEX3, DL_INDEX4) ? dl->nr : dl->nr * dl->parts;
if (tot) doit = 1;
@@ -414,12 +433,14 @@
{
Nurb *nu;
int tot = 0;
-
+
nu = nurb->first;
while (nu) {
- if (nu->bezt) tot += 3 * nu->pntsu;
- else if (nu->bp) tot += nu->pntsu * nu->pntsv;
-
+ if (nu->bezt)
+ tot += 3 * nu->pntsu;
+ else if (nu->bp)
+ tot += nu->pntsu * nu->pntsv;
+
nu = nu->next;
}
return tot;
@@ -429,12 +450,14 @@
{
Nurb *nu;
int tot = 0;
-
+
nu = nurb->first;
while (nu) {
- if (nu->bezt) tot += nu->pntsu;
- else if (nu->bp) tot += nu->pntsu * nu->pntsv;
-
+ if (nu->bezt)
+ tot += nu->pntsu;
+ else if (nu->bp)
+ tot += nu->pntsu * nu->pntsv;
+
nu = nu->next;
}
return tot;
@@ -447,13 +470,17 @@
if (nu == NULL) return;
- if (nu->bezt) MEM_freeN(nu->bezt);
+ if (nu->bezt)
+ MEM_freeN(nu->bezt);
nu->bezt = NULL;
- if (nu->bp) MEM_freeN(nu->bp);
+ if (nu->bp)
+ MEM_freeN(nu->bp);
nu->bp = NULL;
- if (nu->knotsu) MEM_freeN(nu->knotsu);
+ if (nu->knotsu)
+ MEM_freeN(nu->knotsu);
nu->knotsu = NULL;
- if (nu->knotsv) MEM_freeN(nu->knotsv);
+ if (nu->knotsv)
+ MEM_freeN(nu->knotsv);
nu->knotsv = NULL;
/* if (nu->trim.first) freeNurblist(&(nu->trim)); */
@@ -496,9 +523,9 @@
newnu->bp =
(BPoint *)MEM_mallocN((len) * sizeof(BPoint), "duplicateNurb3");
memcpy(newnu->bp, nu->bp, len * sizeof(BPoint));
-
+
newnu->knotsu = newnu->knotsv = NULL;
-
+
if (nu->knotsu) {
len = KNOTSU(nu);
if (len) {
@@ -520,14 +547,14 @@
void BKE_nurbList_duplicate(ListBase *lb1, ListBase *lb2)
{
Nurb *nu, *nun;
-
+
BKE_nurbList_free(lb1);
-
+
nu = lb2->first;
while (nu) {
nun = BKE_nurb_duplicate(nu);
BLI_addtail(lb1, nun);
-
+
nu = nu->next;
}
}
@@ -537,7 +564,7 @@
BezTriple *bezt;
BPoint *bp;
int a;
-
+
if ((nu->flag & CU_2D) == 0)
return;
@@ -643,7 +670,8 @@
k = 0.0;
for (a = 1; a <= pnts_order; a++) {
knots[a - 1] = k;
- if (a >= order && a <= pnts) k += 1.0f;
+ if (a >= order && a <= pnts)
+ k += 1.0f;
}
break;
case CU_NURB_BEZIER:
@@ -659,7 +687,8 @@
else if (order == 3) {
k = 0.6f;
for (a = 0; a < pnts_order; a++) {
- if (a >= order && a <= pnts) k += 0.5f;
+ if (a >= order && a <= pnts)
+ k += 0.5f;
knots[a] = floorf(k);
}
}
@@ -680,7 +709,8 @@
{
int a, b, order2, c;
- if (knots == NULL) return;
+ if (knots == NULL)
+ return;
order2 = order - 1;
@@ -688,9 +718,11 @@
if (order > 2) {
b = pnts + order2;
for (a = 1; a < order2; a++) {
- if (knots[b] != knots[b - a]) break;
+ if (knots[b] != knots[b - a])
+ break;
}
- if (a == order2) knots[pnts + order - 2] += 1.0f;
+ if (a == order2)
+ knots[pnts + order - 2] += 1.0f;
}
b = order;
@@ -707,7 +739,8 @@
{
if (nu->type == CU_NURBS) {
if (uv == 1) {
- if (nu->knotsu) MEM_freeN(nu->knotsu);
+ if (nu->knotsu)
+ MEM_freeN(nu->knotsu);
if (BKE_nurb_check_valid_u(nu)) {
nu->knotsu = MEM_callocN(4 + sizeof(float) * KNOTSU(nu), "makeknots");
if (nu->flagu & CU_NURB_CYCLIC) {
@@ -718,11 +751,12 @@
calcknots(nu->knotsu, nu->pntsu, nu->orderu, nu->flagu);
}
}
- else nu->knotsu = NULL;
-
+ else
+ nu->knotsu = NULL;
}
else if (uv == 2) {
- if (nu->knotsv) MEM_freeN(nu->knotsv);
+ if (nu->knotsv)
+ MEM_freeN(nu->knotsv);
if (BKE_nurb_check_valid_v(nu)) {
nu->knotsv = MEM_callocN(4 + sizeof(float) * KNOTSV(nu), "makeknots");
if (nu->flagv & CU_NURB_CYCLIC) {
@@ -757,8 +791,10 @@
opp2 = orderpluspnts - 1;
/* this is for float inaccuracy */
- if (t < knots[0]) t = knots[0];
- else if (t > knots[opp2]) t = knots[opp2];
+ if (t < knots[0])
+ t = knots[0];
+ else
+ if (t > knots[opp2]) t = knots[opp2];
/* this part is order '1' */
o2 = order + 1;
@@ -775,10 +811,11 @@
}
break;
}
- else basis[i] = 0.0;
+ else
+ basis[i] = 0.0;
}
basis[i] = 0.0;
-
+
/* this is order 2, 3, ... */
for (j = 2; j <= order; j++) {
@@ -819,22 +856,25 @@
float u, v, ustart, uend, ustep, vstart, vend, vstep, sumdiv;
int i, j, iofs, jofs, cycl, len, curu, curv;
int istart, iend, jsta, jen, *jstart, *jend, ratcomp;
-
+
int totu = nu->pntsu * resolu, totv = nu->pntsv * resolv;
-
- if (nu->knotsu == NULL || nu->knotsv == NULL) return;
- if (nu->orderu > nu->pntsu) return;
- if (nu->orderv > nu->pntsv) return;
- if (coord_array == NULL) return;
-
+
+ if (nu->knotsu == NULL || nu->knotsv == NULL)
+ return;
+ if (nu->orderu > nu->pntsu)
+ return;
+ if (nu->orderv > nu->pntsv)
+ return;
+ if (coord_array == NULL)
+ return;
+
/* allocate and initialize */
len = totu * totv;
- if (len == 0) return;
-
+ if (len == 0)
+ return;
-
sum = (float *)MEM_callocN(sizeof(float) * len, "makeNurbfaces1");
-
+
len = totu * totv;
if (len == 0) {
MEM_freeN(sum);
@@ -851,11 +891,13 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list