Commit: d4934f8f6d8d2da457adb6dd32047eb1627459a0
Author: Campbell Barton
Date: Wed Feb 11 18:38:41 2015 +1100
Branches: master
https://developer.blender.org/rBd4934f8f6d8d2da457adb6dd32047eb1627459a0
cleanup: style/indentation
===================================================================
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/noise.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/compositor/intern/COM_MemoryBuffer.cpp
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/transform/transform.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_material.c
M source/blender/imbuf/intern/divers.c
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/quicktime/apple/qtkit_export.m
M source/blender/render/intern/source/pipeline.c
M source/gameengine/Ketsji/KX_MouseActuator.cpp
===================================================================
diff --git a/source/blender/blenkernel/intern/movieclip.c
b/source/blender/blenkernel/intern/movieclip.c
index 491fb46..73f75f4 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -790,10 +790,10 @@ static ImBuf *postprocess_frame(MovieClip *clip,
MovieClipUser *user, ImBuf *ibu
}
if (postprocess_flag) {
- bool disable_red = (postprocess_flag & MOVIECLIP_DISABLE_RED)
!= 0,
- disable_green = (postprocess_flag &
MOVIECLIP_DISABLE_GREEN) != 0,
- disable_blue = (postprocess_flag &
MOVIECLIP_DISABLE_BLUE) != 0,
- grayscale = (postprocess_flag &
MOVIECLIP_PREVIEW_GRAYSCALE) != 0;
+ bool disable_red = (postprocess_flag & MOVIECLIP_DISABLE_RED)
!= 0;
+ bool disable_green = (postprocess_flag &
MOVIECLIP_DISABLE_GREEN) != 0;
+ bool disable_blue = (postprocess_flag &
MOVIECLIP_DISABLE_BLUE) != 0;
+ bool grayscale = (postprocess_flag &
MOVIECLIP_PREVIEW_GRAYSCALE) != 0;
if (disable_red || disable_green || disable_blue || grayscale)
BKE_tracking_disable_channels(postproc_ibuf,
disable_red, disable_green, disable_blue, 1);
diff --git a/source/blender/blenkernel/intern/seqeffects.c
b/source/blender/blenkernel/intern/seqeffects.c
index 11a6cb7..6157d63 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2670,8 +2670,8 @@ static void do_gaussian_blur_effect_byte(Sequence *seq,
{
#define INDEX(_x, _y) (((_y) * (x) + (_x)) * 4)
GaussianBlurVars *data = seq->effectdata;
- const int size_x = (int) (data->size_x + 0.5f),
- size_y = (int) (data->size_y + 0.5f);
+ const int size_x = (int) (data->size_x + 0.5f);
+ const int size_y = (int) (data->size_y + 0.5f);
int i, j;
/* Make gaussian weight tabke. */
@@ -2754,8 +2754,8 @@ static void do_gaussian_blur_effect_float(Sequence *seq,
{
#define INDEX(_x, _y) (((_y) * (x) + (_x)) * 4)
GaussianBlurVars *data = seq->effectdata;
- const int size_x = (int) (data->size_x + 0.5f),
- size_y = (int) (data->size_y + 0.5f);
+ const int size_x = (int) (data->size_x + 0.5f);
+ const int size_y = (int) (data->size_y + 0.5f);
int i, j;
/* Make gaussian weight tabke. */
diff --git a/source/blender/blenkernel/intern/softbody.c
b/source/blender/blenkernel/intern/softbody.c
index 941344c..06d0627 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1945,7 +1945,7 @@ static int sb_detect_vertex_collisionCached(float
opco[3], float facenormal[3],
float dist;
closest_to_line_segment_v3(ve, opco, nv1, nv2);
- sub_v3_v3v3(ve, opco,
ve);
+ sub_v3_v3v3(ve, opco,
ve);
dist = normalize_v3(ve);
if ((dist <
outerfacethickness)&&(dist < mindistedge )) {
copy_v3_v3(coledge, ve);
diff --git a/source/blender/blenlib/intern/noise.c
b/source/blender/blenlib/intern/noise.c
index f002ea5..5febf72 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -278,8 +278,8 @@ static float npfade(float t)
static float grad(int hash_val, float x, float y, float z)
{
int h = hash_val & 15; /* CONVERT LO 4 BITS OF HASH
CODE */
- float u = h < 8 ? x : y, /* INTO 12 GRADIENT DIRECTIONS.
*/
- v = h < 4 ? y : h == 12 || h == 14 ? x : z;
+ float u = h < 8 ? x : y; /* INTO 12 GRADIENT DIRECTIONS.
*/
+ float v = h < 4 ? y : h == 12 || h == 14 ? x : z;
return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v);
}
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c
b/source/blender/bmesh/tools/bmesh_bevel.c
index b25572e..a418ade 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2896,8 +2896,9 @@ static BevVert *bevel_vert_construct(BMesh *bm,
BevelParams *bp, BMVert *v)
nwire++;
/* If edge beveling, exclude wire edges from edges
array.
* Mark this edge as "chosen" so loop below won't
choose it. */
- if (!bp->vertex_only)
+ if (!bp->vertex_only) {
BM_BEVEL_EDGE_TAG_ENABLE(bme);
+ }
}
}
if (!first_bme)
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index 37035c5..9e6e5a4 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -187,11 +187,11 @@ void MemoryBuffer::addPixel(int x, int y, const float
color[4])
y >= this->m_rect.ymin && y < this->m_rect.ymax)
{
const int offset = (this->m_width * (y - this->m_rect.ymin) + x
- this->m_rect.xmin) * this->m_num_channels;
- float *dst = &this->m_buffer[offset];
- const float *src = color;
- for (int i = 0; i < this->m_num_channels ; i++, dst++, src++) {
- *dst += *src;
- }
+ float *dst = &this->m_buffer[offset];
+ const float *src = color;
+ for (int i = 0; i < this->m_num_channels ; i++, dst++, src++) {
+ *dst += *src;
+ }
}
}
diff --git a/source/blender/editors/mesh/editmesh_tools.c
b/source/blender/editors/mesh/editmesh_tools.c
index 16b74c3..5127844 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2745,7 +2745,7 @@ static void mesh_separate_material_assign_mat_nr(Object
*ob, const short mat_nr)
}
if (mat_nr < *totcolp) {
- ma_obdata = (*matarar)[mat_nr];
+ ma_obdata = (*matarar)[mat_nr];
}
else {
ma_obdata = NULL;
diff --git a/source/blender/editors/mesh/meshtools.c
b/source/blender/editors/mesh/meshtools.c
index dee216d..00d79b2 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -895,7 +895,7 @@ int ED_mesh_mirror_get_vert(Object *ob, int index)
index_mirr = eve_mirr ? BM_elem_index_get(eve_mirr) : -1;
}
else {
- index_mirr = mesh_get_x_mirror_vert(ob, index, use_topology);
+ index_mirr = mesh_get_x_mirror_vert(ob, index, use_topology);
}
return index_mirr;
diff --git a/source/blender/editors/render/render_internal.c
b/source/blender/editors/render/render_internal.c
index b04f1d3..8fcd91b 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1146,8 +1146,8 @@ BLI_INLINE void rcti_scale_coords(rcti *scaled_rect,
const rcti *rect,
static void render_update_resolution(Render *re, const RenderPreview *rp,
bool use_border, const rcti *clip_rect)
{
- int winx = rp->ar->winx / rp->resolution_divider,
- winy = rp->ar->winy / rp->resolution_divider;
+ int winx = rp->ar->winx / rp->resolution_divider;
+ int winy = rp->ar->winy / rp->resolution_divider;
if (use_border) {
rcti scaled_cliprct;
rcti_scale_coords(&scaled_cliprct, clip_rect,
@@ -1461,7 +1461,7 @@ static void render_view3d_do(RenderEngine *engine, const
bContext *C)
engine->flag &= ~RE_ENGINE_DO_UPDATE;
}
-/* callback for render engine , on changes */
+/* callback for render engine, on changes */
void render_view3d_update(RenderEngine *engine, const bContext *C)
{
/* this shouldn't be needed and causes too many database rebuilds, but
we
diff --git a/source/blender/editors/screen/screen_edit.c
b/source/blender/editors/screen/screen_edit.c
index f338fa1..deb6c7b 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -2093,7 +2093,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene,
int UNUSED(mute))
/* this function applies the changes too */
BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, layers);
- //if ( (CFRA>1) && (!mute) && (scene->r.audio.flag & AUDIO_SCRUB))
+ //if ((CFRA > 1) && (!mute) && (scene->r.audio.flag & AUDIO_SCRUB))
// audiostream_scrub( CFRA );
/* 3d window, preview */
diff --git a/source/blender/editors/sound/sound_ops.c
b/source/blender/editors/sound/sound_ops.c
index 5ce3517..f3c6781 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -242,7 +242,7 @@ static int sound_update_animation_flags_exec(bContext *C,
wmOperator *UNUSED(op)
}
SEQ_END
- fcu = id_data_find_fcurve(&scene->id, scene, &RNA_Scene,
"audio_volume", 0, &driven);
+ fcu = id_data_find_fcurve(&scene->id, scene, &RNA_Scene,
"audio_volume", 0, &driven);
if (fcu || driven)
scene->audio.flag |= AUDIO_VOLUME_ANIMATED;
else
diff --git a/source/blender/editors/space_outliner/outliner_tree.c
b/source/blender/editors/space_outliner/outliner_tree.c
index abc8277..c956d77 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -828,6 +828,7 @@ static void outliner_add_id_contents(SpaceOops *soops,
TreeElement *te, TreeStor
outliner_add_element(soops, &te->subtree, gpl,
te, TSE_GP_LAYER, a);
a++;
}
+ break;
}
}
}
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index 2cf8031..92103c3 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1503,7 +1503,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
if ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) !=
(modifiers_prev & (MOD_SNAP | MOD_SNAP_INVERT)))
{
- applyMouseInput(t, &t->mouse, t->mval, t->values);
+ applyMouseInput(t, &t->mouse, t->mval, t->values);
}
/* Per transform event, if present */
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c
b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index 4cb1f89..f7a8735 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -574,11 +574,11 @@ static void
stitch_island_calculate_vert_rotation(UvElement *element, StitchStat
edgecos = dot_v2v2(normal, state->normals + index_tmp1
* 2);
edgesin = cross_v2v2(normal, state->normals +
index_tmp1 * 2);
if (edgesin > 0.0f) {
- rotation += acosf(max_ff(-1.0f, min_ff(1.0f,
edgecos)));
+ rotation += acosf(max_ff(-1.0f, min_ff(1.0f,
edgecos)));
rot_elem++;
}
else {
- rotation_neg += acosf(max_ff(-1.0f, min_
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
