[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47092] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun May 27 21:40:36 CEST 2012
Revision: 47092
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47092
Author: campbellbarton
Date: 2012-05-27 19:40:36 +0000 (Sun, 27 May 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/ghost/test/multitest/MultiTest.c
trunk/blender/release/plugins/sequence/gamma.c
trunk/blender/source/blender/blenfont/intern/blf.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/bullet.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/group.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenloader/intern/runtime.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/datafiles/Bfont.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -656,7 +656,8 @@
int size[2];
} ExtraWindow;
-static void extrawindow_do_draw(ExtraWindow *ew) {
+static void extrawindow_do_draw(ExtraWindow *ew)
+{
GHOST_ActivateWindowDrawingContext(ew->win);
glClearColor(1, 1, 1, 1);
@@ -668,7 +669,8 @@
GHOST_SwapWindowBuffers(ew->win);
}
-static void extrawindow_do_reshape(ExtraWindow *ew) {
+static void extrawindow_do_reshape(ExtraWindow *ew)
+{
GHOST_RectangleHandle bounds = GHOST_GetClientBounds(ew->win);
GHOST_ActivateWindowDrawingContext(ew->win);
@@ -687,7 +689,8 @@
glLoadIdentity();
}
-static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press) {
+static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press)
+{
switch (key) {
case GHOST_kKeyE:
if (press)
@@ -696,7 +699,8 @@
}
}
-static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) {
+static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time)
+{
GHOST_TUns8 bitmap[16][2];
GHOST_TUns8 mask[16][2];
double ftime = (double) ((GHOST_TInt64) time) / 1000;
@@ -728,7 +732,8 @@
GHOST_SetCustomCursorShape(ew->win, bitmap, mask, 0, 0);
}
-static void extrawindow_handle(void *priv, GHOST_EventHandle evt) {
+static void extrawindow_handle(void *priv, GHOST_EventHandle evt)
+{
ExtraWindow *ew = priv;
GHOST_TEventType type = GHOST_GetEventType(evt);
char buf[256];
@@ -785,7 +790,8 @@
}
}
-void extrawindow_free(ExtraWindow *ew) {
+void extrawindow_free(ExtraWindow *ew)
+{
GHOST_SystemHandle sys = multitestapp_get_system(ew->app);
windowdata_free(GHOST_GetWindowUserData(ew->win));
@@ -806,7 +812,8 @@
int exit;
};
-static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr data) {
+static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr data)
+{
MultiTestApp *app = data;
GHOST_WindowHandle win;
@@ -876,12 +883,14 @@
return app->sys;
}
-void multitestapp_free_extrawindow(MultiTestApp *app) {
+void multitestapp_free_extrawindow(MultiTestApp *app)
+{
extrawindow_free(app->extra);
app->extra = NULL;
}
-void multitestapp_toggle_extra_window(MultiTestApp *app) {
+void multitestapp_toggle_extra_window(MultiTestApp *app)
+{
if (app->extra) {
multitestapp_free_extrawindow(app);
}
Modified: trunk/blender/release/plugins/sequence/gamma.c
===================================================================
--- trunk/blender/release/plugins/sequence/gamma.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/release/plugins/sequence/gamma.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -176,8 +176,8 @@
o[l]=CLAMP(i[l],0.f,1.f);
o[3]=1.0;
}
- i+=4;
- o+=4;
+ i += 4;
+ o += 4;
}
}
}
Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenfont/intern/blf.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -154,7 +154,7 @@
/* check if we already load this font. */
i = blf_search(name);
if (i >= 0) {
- /*font= global_font[i];*/ /*UNUSED*/
+ /*font = global_font[i];*/ /*UNUSED*/
return i;
}
@@ -237,7 +237,7 @@
i = blf_search(name);
if (i >= 0) {
- /*font= global_font[i];*/ /*UNUSED*/
+ /*font = global_font[i];*/ /*UNUSED*/
return i;
}
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -1577,7 +1577,7 @@
PropertyRNA *prop;
PointerRNA new_ptr;
char *path = NULL;
- /* short free_path=0; */
+ /* short free_path = 0; */
/* sanity checks */
if (channels == NULL)
@@ -1585,7 +1585,7 @@
/* get RNA pointer+property info from F-Curve for more convenient handling */
/* get path, remapped as appropriate to work in its new environment */
- /* free_path= */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path);
+ /* free_path = */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path);
/* a valid property must be available, and it must be animatable */
if (RNA_path_resolve(ptr, path, &new_ptr, &prop) == 0) {
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -518,7 +518,7 @@
if ( (U.uiflag & USER_GLOBALUNDO) == 0) return;
if (U.undosteps == 0) return;
- /* remove all undos after (also when curundo==NULL) */
+ /* remove all undos after (also when curundo == NULL) */
while (undobase.last != curundo) {
uel = undobase.last;
BLI_remlink(&undobase, uel);
@@ -564,7 +564,7 @@
BLI_snprintf(numstr, sizeof(numstr), "%d.blend", counter);
BLI_make_file_string("/", filepath, BLI_temporary_dir(), numstr);
- /* success= */ /* UNUSED */ BLO_write_file(CTX_data_main(C), filepath, fileflags, NULL, NULL);
+ /* success = */ /* UNUSED */ BLO_write_file(CTX_data_main(C), filepath, fileflags, NULL, NULL);
BLI_strncpy(curundo->str, filepath, sizeof(curundo->str));
}
@@ -574,7 +574,7 @@
if (curundo->prev) prevfile = &(curundo->prev->memfile);
memused = MEM_get_memory_in_use();
- /* success= */ /* UNUSED */ BLO_write_file_mem(CTX_data_main(C), prevfile, &curundo->memfile, G.fileflags);
+ /* success = */ /* UNUSED */ BLO_write_file_mem(CTX_data_main(C), prevfile, &curundo->memfile, G.fileflags);
curundo->undosize = MEM_get_memory_in_use() - memused;
}
Modified: trunk/blender/source/blender/blenkernel/intern/bullet.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bullet.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/bullet.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -45,7 +45,7 @@
{
BulletSoftBody *bsb;
- bsb= MEM_callocN(sizeof(BulletSoftBody), "bulletsoftbody");
+ bsb = MEM_callocN(sizeof(BulletSoftBody), "bulletsoftbody");
bsb->flag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT;
bsb->linStiff = 0.5f;
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -927,7 +927,7 @@
//int actualFace = dm->drawObject->triangle_to_mface[i];
int actualFace = next_actualFace;
MFace *mface = mf + actualFace;
- /*int drawSmooth= (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mface->flag & ME_SMOOTH);*/ /* UNUSED */
+ /*int drawSmooth = (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mface->flag & ME_SMOOTH);*/ /* UNUSED */
DMDrawOption draw_option = DM_DRAW_OPTION_NORMAL;
int flush = 0;
@@ -1208,7 +1208,7 @@
else {
/* if the buffer was set, don't use it again.
* prevdraw was assumed true but didnt run so set to false - [#21036] */
- /* prevdraw= 0; */ /* UNUSED */
+ /* prevdraw = 0; */ /* UNUSED */
buffer = NULL;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/context.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -267,7 +267,7 @@
* loops requesting data from ourselfs in a context callback */
/* Ok, this looks evil...
- * if (ret) done= -(-ret | -done);
+ * if (ret) done = -(-ret | -done);
*
* Values in order of importance
* (0, -1, 1) - Where 1 is highest priority
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -2938,7 +2938,7 @@
queue_delete(nqueue);
// printf("\nordered\n");
-// for (pchan = pose->chanbase.first; pchan; pchan= pchan->next) {
+// for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
// printf(" %s\n", pchan->name);
// }
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-05-27 19:38:10 UTC (rev 47091)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-05-27 19:40:36 UTC (rev 47092)
@@ -594,7 +594,7 @@
float (*vertexCos)[3] = bmdm->vertexCos;
float (*vertexNos)[3] = bmdm->vertexNos;
float (*polyNos)[3] = bmdm->polyNos;
- // int *triPolyMap= bmdm->triPolyMap;
+ // int *triPolyMap = bmdm->triPolyMap;
BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT | BM_FACE);
@@ -802,7 +802,7 @@
BMLoop **ls = em->looptris[i];
MTexPoly *tp = has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL;
MTFace mtf = {{{0}}};
- /*unsigned char *cp= NULL;*/ /*UNUSED*/
+ /*unsigned char *cp = NULL;*/ /*UNUSED*/
int drawSmooth = BM_elem_flag_test(ls[0]->f, BM_ELEM_SMOOTH);
DMDrawOption draw_option;
@@ -874,7 +874,7 @@
BMLoop **ls = em->looptris[i];
MTexPoly *tp = has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL;
MTFace mtf = {{{0}}};
- /*unsigned char *cp= NULL;*/ /*UNUSED*/
+ /*unsigned char *cp = NULL;*/ /*UNUSED*/
int drawSmooth = BM_elem_flag_test(ls[0]->f, BM_ELEM_SMOOTH);
DMDrawOption draw_option;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list