Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-23 02:03:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-23 02:03:41 +0400
commitdab1d8e4874564f182d7b73b603f66a4f34565ad (patch)
treee79733e7f9091b5a5840af54062f8e7bcb770f8b /source/blender/editors
parentd2a37d464a81959eb3409115f320c83af4398934 (diff)
style cleanup
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/sculpt_paint/paint_mask.c4
-rw-r--r--source/blender/editors/space_node/drawnode.c4
-rw-r--r--source/blender/editors/space_node/node_edit.c2
-rw-r--r--source/blender/editors/space_view3d/drawobject.c8
-rw-r--r--source/blender/editors/transform/transform.c8
-rw-r--r--source/blender/editors/transform/transform_conversions.c6
6 files changed, 17 insertions, 15 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index 919d2173bd2..298ecf764d6 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -64,7 +64,7 @@ static void mask_flood_fill_set_elem(float *elem,
PaintMaskFloodMode mode,
float value)
{
- switch(mode) {
+ switch (mode) {
case PAINT_MASK_FLOOD_VALUE:
(*elem) = value;
break;
@@ -96,7 +96,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op)
sculpt_undo_push_begin("Mask flood fill");
- for(i = 0; i < totnode; i++) {
+ for (i = 0; i < totnode; i++) {
PBVHVertexIter vi;
sculpt_undo_push_node(ob, nodes[i], SCULPT_UNDO_MASK);
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 76003be8dc9..db75198bcd4 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -2296,7 +2296,7 @@ void node_composit_backdrop_boxmask(SpaceNode* snode, ImBuf* backdrop, bNode* no
/* keep this, saves us from a version patch */
- if(snode->zoom==0.0f) snode->zoom= 1.0f;
+ if (snode->zoom == 0.0f) snode->zoom = 1.0f;
glColor3f(1.0, 1.0, 1.0);
@@ -2337,7 +2337,7 @@ void node_composit_backdrop_ellipsemask(SpaceNode* snode, ImBuf* backdrop, bNode
/* keep this, saves us from a version patch */
- if(snode->zoom==0.0f) snode->zoom= 1.0f;
+ if (snode->zoom == 0.0f) snode->zoom = 1.0f;
glColor3f(1.0, 1.0, 1.0);
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 5000e0f2163..c4ea8c4025f 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -2521,7 +2521,7 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
/* when linking to group outputs, update the socket type */
/* XXX this should all be part of a generic update system */
if (!link->tonode) {
- if(link->tosock->type != link->fromsock->type)
+ if (link->tosock->type != link->fromsock->type)
nodeSocketSetType(link->tosock, link->fromsock->type);
}
}
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 6ba506bbc5c..9633917344f 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2412,11 +2412,11 @@ static void draw_dm_verts__mapFunc(void *userData, int index, const float co[3],
if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->sel) {
/* skin nodes: draw a red circle around the root
- node(s) */
- if(data->has_vskin) {
+ * node(s) */
+ if (data->has_vskin) {
const MVertSkin *vs = CustomData_bmesh_get(&data->em->bm->vdata,
- eve->head.data,
- CD_MVERT_SKIN);
+ eve->head.data,
+ CD_MVERT_SKIN);
if (vs->flag & MVERT_SKIN_ROOT) {
float radius = (vs->radius[0] + vs->radius[1]) * 0.5f;
bglEnd();
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index fea6f7266b2..45e5fb10bc0 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -617,7 +617,7 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
char axis;
/* Initialize */
- switch(key_type) {
+ switch (key_type) {
case XKEY:
axis = 'X';
constraint_axis = CON_AXIS0;
@@ -1141,9 +1141,11 @@ int calculateTransformCenter(bContext *C, int centerMode, float *cent3d, int *ce
calculateCenter(t);
- if(cent2d)
+ if (cent2d) {
copy_v2_v2_int(cent2d, t->center2d);
- if(cent3d) {
+ }
+
+ if (cent3d) {
// Copy center from constraint center. Transform center can be local
copy_v3_v3(cent3d, t->con.center);
}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 213a22b2c10..1e22179a432 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1920,10 +1920,10 @@ static void VertsToTransData(TransInfo *t, TransData *td, TransDataExtension *tx
td->val = bweight;
td->ival = bweight ? *(bweight) : 1.0f;
}
- else if(t->mode == TFM_SKIN_RESIZE) {
+ else if (t->mode == TFM_SKIN_RESIZE) {
MVertSkin *vs = CustomData_bmesh_get(&em->bm->vdata,
- eve->head.data,
- CD_MVERT_SKIN);
+ eve->head.data,
+ CD_MVERT_SKIN);
/* skin node size */
td->ext = tx;
copy_v3_v3(tx->isize, vs->radius);