Commit: 03af4cbf9173dd0440517dd0b9f8d464a4ec0350
Author: Campbell Barton
Date: Fri Mar 7 13:28:39 2014 +1100
https://developer.blender.org/rB03af4cbf9173dd0440517dd0b9f8d464a4ec0350
Code cleanup: style
===================================================================
M source/blender/blenkernel/intern/brush.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_text/space_text.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/nodes/intern/node_util.c
M source/blender/nodes/shader/nodes/node_shader_tex_wave.c
===================================================================
diff --git a/source/blender/blenkernel/intern/brush.c
b/source/blender/blenkernel/intern/brush.c
index 68da8f1..5ef7094 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -993,7 +993,7 @@ unsigned int *BKE_brush_gen_texture_cache(Brush *br, int
half_side, bool use_sec
/* This is copied from displace modifier code */
/* TODO(sergey): brush are always cacheing with
CM enabled for now. */
externtex(mtex, co, &intensity,
- rgba, rgba + 1, rgba + 2,
rgba + 3, 0, NULL);
+ rgba, rgba + 1, rgba + 2, rgba + 3,
0, NULL);
((char *)texcache)[(iy * side + ix) * 4] =
((char *)texcache)[(iy * side + ix) * 4 + 1] =
diff --git a/source/blender/editors/sculpt_paint/sculpt.c
b/source/blender/editors/sculpt_paint/sculpt.c
index 9b92ca6..df1b14a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3922,8 +3922,8 @@ static void sculpt_update_cache_invariants(bContext *C,
Sculpt *sd, SculptSessio
mul_m3_v3(mat, viewDir);
normalize_v3_v3(cache->true_view_normal, viewDir);
- cache->supports_gravity = !ELEM3(brush->sculpt_tool, SCULPT_TOOL_MASK,
SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SIMPLIFY)
- && sd->gravity_factor
> 0.0f;
+ cache->supports_gravity = (!ELEM3(brush->sculpt_tool, SCULPT_TOOL_MASK,
SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SIMPLIFY) &&
+ (sd->gravity_factor > 0.0f));
/* get gravity vector in world space */
if (cache->supports_gravity) {
if (sd->gravity_object) {
@@ -4486,13 +4486,13 @@ static void sculpt_stroke_update_step(bContext *C,
struct PaintStroke *UNUSED(st
sculpt_restore_mesh(sd, ob);
if (sd->flags & SCULPT_DYNTOPO_DETAIL_CONSTANT) {
- BKE_pbvh_bmesh_detail_size_set(ss->pbvh,
(float)sd->detail_size/100.0f);
+ BKE_pbvh_bmesh_detail_size_set(ss->pbvh, (float)sd->detail_size
/ 100.0f);
}
else {
BKE_pbvh_bmesh_detail_size_set(ss->pbvh,
-
(ss->cache->radius /
-
(float)ups->pixel_radius) *
-
(float)sd->detail_size);
+ (ss->cache->radius /
+ (float)ups->pixel_radius) *
+ (float)sd->detail_size);
}
if (sculpt_stroke_dynamic_topology(ss, brush)) {
diff --git a/source/blender/editors/space_text/space_text.c
b/source/blender/editors/space_text/space_text.c
index 8b08000..2986408 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -454,7 +454,7 @@ static void text_cursor(wmWindow *win, ScrArea *sa, ARegion
*ar)
SpaceText *st = sa->spacedata.first;
int wmcursor = BC_TEXTEDITCURSOR;
- if(st->text && BLI_rcti_isect_pt(&st->txtbar, win->eventstate->x -
ar->winrct.xmin, st->txtbar.ymin)) {
+ if (st->text && BLI_rcti_isect_pt(&st->txtbar, win->eventstate->x -
ar->winrct.xmin, st->txtbar.ymin)) {
wmcursor = CURSOR_STD;
}
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c
b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index 6bf9315..3af947b 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -685,7 +685,7 @@ static void stitch_uv_edge_generate_linked_edges(GHash
*edge_hash, StitchState *
edge2 = BLI_ghash_lookup(edge_hash,
&edgetmp);
/* more iteration to make sure
non-manifold case is handled nicely */
- for (eiter = edge; eiter; eiter =
eiter->next){
+ for (eiter = edge; eiter; eiter =
eiter->next) {
if (edge2 == eiter) {
valid = false;
break;
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c
b/source/blender/makesrna/intern/rna_sculpt_paint.c
index e13e9b3..635c9a3 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -441,7 +441,7 @@ static void rna_def_sculpt(BlenderRNA *brna)
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags");
RNA_def_property_enum_items(prop, detail_type_items);
RNA_def_property_ui_text(prop, "Detail Type Method",
- "In dynamic-topology
mode, how mesh detail size is calculated");
+ "In dynamic-topology mode, how mesh detail
size is calculated");
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
prop = RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_NONE);
diff --git a/source/blender/nodes/intern/node_util.c
b/source/blender/nodes/intern/node_util.c
index d3bde0a..dcc58d3 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -196,8 +196,10 @@ static bNodeSocket *select_internal_link_input(bNode
*node, bNodeSocket *output)
if (nodeSocketIsHidden(input) || /* ignore
hidden sockets */
input->flag & SOCK_NO_INTERNAL_LINK || /* ignore if
input is not allowed for internal connections */
priority < 0 || /* ignore
incompatible types */
- priority < sel_priority) /* ignore if we
already found a higher priority input */
+ priority < sel_priority) /* ignore if we
already found a higher priority input */
+ {
continue;
+ }
/* determine if this input is preferred over the currently
selected */
preferred = (priority > sel_priority) || /* prefer higher
datatype priority */
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
index e502f7d..7dc97ad 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
@@ -38,7 +38,7 @@ static bNodeSocketTemplate sh_node_tex_wave_in[] = {
{ -1, 0, "" }
};
-const bool internal_links[5] = {0,0,0,0,0};
+const bool internal_links[5] = {0, 0, 0, 0, 0};
static bNodeSocketTemplate sh_node_tex_wave_out[] = {
{ SOCK_RGBA, 0, N_("Color"), 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, PROP_NONE, SOCK_NO_INTERNAL_LINK},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
