[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55682] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Mar 31 05:28:49 CEST 2013
Revision: 55682
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55682
Author: campbellbarton
Date: 2013-03-31 03:28:46 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sca.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_250.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/operators/bmo_beautify.c
trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c
trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/include/ED_types.h
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl
trunk/blender/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl
trunk/blender/source/blender/imbuf/intern/rectop.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -574,13 +574,13 @@
y = point_2d[1] - ups->tex_mouse[1];
/* use pressure adjusted size for fixed mode */
- invradius = 1.0/ups->pixel_radius;
+ invradius = 1.0f / ups->pixel_radius;
}
else if (mtex->brush_map_mode == MTEX_MAP_MODE_TILED) {
/* leave the coordinates relative to the screen */
/* use unadjusted size for tiled mode */
- invradius = 1.0/BKE_brush_size_get(scene, br);
+ invradius = 1.0f / BKE_brush_size_get(scene, br);
x = point_2d[0];
y = point_2d[1];
@@ -591,7 +591,7 @@
x = point_2d[0] - ups->tex_mouse[0];
y = point_2d[1] - ups->tex_mouse[1];
- invradius = 1.0/ups->pixel_radius;
+ invradius = 1.0f / ups->pixel_radius;
}
x *= invradius;
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -3011,7 +3011,7 @@
*lock_r = ima;
/* XXX anim play for viewer nodes not yet supported */
- frame = 0; // XXX iuser?iuser->framenr:0;
+ frame = 0; // XXX iuser ? iuser->framenr : 0;
ibuf = image_get_ibuf(ima, 0, frame);
if (!ibuf) {
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -1346,7 +1346,7 @@
ctx->jitoff= jitter_offset;
ctx->weight= element_weight;
ctx->maxweight= maxweight;
- ctx->from= (children)? PART_FROM_CHILD: from;
+ ctx->from= (children) ? PART_FROM_CHILD : from;
ctx->cfrom= cfrom;
ctx->distr= distr;
ctx->dm= dm;
@@ -2039,7 +2039,7 @@
ksim.psys->flag |= keyed_flag;
- pt = (pt->next && pt->next->flag & PTARGET_VALID)? pt->next : psys->targets.first;
+ pt = (pt->next && pt->next->flag & PTARGET_VALID) ? pt->next : psys->targets.first;
}
psys->flag |= PSYS_KEYED;
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -1396,7 +1396,7 @@
static int ptcache_path(PTCacheID *pid, char *filename)
{
- Library *lib= (pid->ob)? pid->ob->id.lib: NULL;
+ Library *lib = (pid->ob) ? pid->ob->id.lib : NULL;
const char *blendfilename= (lib && (pid->cache->flag & PTCACHE_IGNORE_LIBPATH)==0) ? lib->filepath: G.main->name;
size_t i;
Modified: trunk/blender/source/blender/blenkernel/intern/sca.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sca.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenkernel/intern/sca.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -705,7 +705,7 @@
bSensor *sens, *tmp;
int val;
- val = move_up ? 1:2;
+ val = move_up ? 1 : 2;
/* make sure this sensor belongs to this object */
sens= ob->sensors.first;
@@ -744,7 +744,7 @@
bController *cont, *tmp;
int val;
- val = move_up ? 1:2;
+ val = move_up ? 1 : 2;
/* make sure this controller belongs to this object */
cont= ob->controllers.first;
@@ -787,7 +787,7 @@
bActuator *act, *tmp;
int val;
- val = move_up ? 1:2;
+ val = move_up ? 1 : 2;
/* make sure this actuator belongs to this object */
act= ob->actuators.first;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -7935,7 +7935,7 @@
if (ba->axis==(float) 'x') ba->axis=OB_POSX;
else if (ba->axis==(float)'y') ba->axis=OB_POSY;
/* don't do an if/else to avoid imediate subversion bump*/
-// ba->axis=((ba->axis == (float) 'x')?OB_POSX_X:OB_POSY);
+// ba->axis=((ba->axis == (float)'x') ? OB_POSX_X : OB_POSY);
}
}
}
Modified: trunk/blender/source/blender/blenloader/intern/versioning_250.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_250.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenloader/intern/versioning_250.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -1070,7 +1070,7 @@
sce->gm.dome.warptext = sce->r.dometext;
/* Stand Alone */
- sce->gm.playerflag |= (sce->r.fullscreen?GAME_PLAYER_FULLSCREEN:0);
+ sce->gm.playerflag |= (sce->r.fullscreen ? GAME_PLAYER_FULLSCREEN : 0);
sce->gm.xplay = sce->r.xplay;
sce->gm.yplay = sce->r.yplay;
sce->gm.freqplay = sce->r.freqplay;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -800,9 +800,9 @@
/* find a global current screen in the first open window, to have
* a reasonable default for reading in older versions */
- wm= mainvar->wm.first;
- window= (wm)? wm->windows.first: NULL;
- *screen= (window)? window->screen: NULL;
+ wm = mainvar->wm.first;
+ window = (wm) ? wm->windows.first : NULL;
+ *screen = (window) ? window->screen : NULL;
}
typedef struct RenderInfo {
@@ -3014,7 +3014,7 @@
/* XXX still remap G */
fg.curscreen= screen;
- fg.curscene= screen? screen->scene : NULL;
+ fg.curscene= screen ? screen->scene : NULL;
fg.displaymode= G.displaymode;
fg.winpos= G.winpos;
@@ -3075,7 +3075,11 @@
}
#endif
- sprintf(buf, "BLENDER%c%c%.3d", (sizeof(void*)==8)?'-':'_', (ENDIAN_ORDER==B_ENDIAN)?'V':'v', BLENDER_VERSION);
+ sprintf(buf, "BLENDER%c%c%.3d",
+ (sizeof(void *) == 8) ? '-' : '_',
+ (ENDIAN_ORDER == B_ENDIAN) ? 'V' : 'v',
+ BLENDER_VERSION);
+
mywrite(wd, buf, 12);
write_renderinfo(wd, mainvar);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_beautify.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_beautify.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/bmesh/operators/bmo_beautify.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -156,9 +156,9 @@
// printf("%p %p %p %p - %p %p\n", v1, v2, v3, v4, e->l->f, e->l->radial_next->f);
BLI_assert((ELEM3(v1, v2, v3, v4) == false) &&
- (ELEM3(v2, v1, v3, v4) == false) &&
- (ELEM3(v3, v1, v2, v4) == false) &&
- (ELEM3(v4, v1, v2, v3) == false));
+ (ELEM3(v2, v1, v3, v4) == false) &&
+ (ELEM3(v3, v1, v2, v4) == false) &&
+ (ELEM3(v4, v1, v2, v3) == false));
is_zero_a = area_tri_v3(v2, v3, v4) <= FLT_EPSILON;
is_zero_b = area_tri_v3(v2, v4, v1) <= FLT_EPSILON;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/bmesh/operators/bmo_edgenet.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -45,7 +45,6 @@
#define FACE_NEW 1
#define ELE_NEW 1
-#define ELE_OUT 2
#define ELE_ORIG 4
#define FACE_IGNORE 16
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -675,7 +675,7 @@
return;
}
- lastd = bp->vertex_only? bv->offset : e->offset;
+ lastd = bp->vertex_only ? bv->offset : e->offset;
vm->boundstart = NULL;
do {
if (e->is_bev) {
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -993,7 +993,7 @@
vquadrics = MEM_callocN(sizeof(Quadric) * bm->totvert, __func__);
/* since some edges may be degenerate, we might be over allocing a little here */
eheap = BLI_heap_new_ex(bm->totedge);
- eheap_table = MEM_callocN(sizeof(HeapNode *) * bm->totedge, __func__);
+ eheap_table = MEM_mallocN(sizeof(HeapNode *) * bm->totedge, __func__);
tot_edge_orig = bm->totedge;
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2013-03-31 01:18:10 UTC (rev 55681)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2013-03-31 03:28:46 UTC (rev 55682)
@@ -3289,13 +3289,13 @@
break;
case ACHANNEL_SETTING_EXPAND: /* expanded triangle */
- //icon = ((enabled)? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
+ //icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
icon = ICON_TRIA_RIGHT;
tooltip = TIP_("Make channels grouped under this channel visible");
break;
case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */
- //icon = ((enabled)? ICON_LAYER_ACTIVE : ICON_LAYER_USED);
+ //icon = ((enabled) ? ICON_LAYER_ACTIVE : ICON_LAYER_USED);
icon = ICON_LAYER_USED;
tooltip = TIP_("NLA Track is the only one evaluated for the AnimData block it belongs to");
break;
@@ -3304,13 +3304,13 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list