diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-11 10:38:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-11 10:39:28 +0300 |
| commit | d4934f8f6d8d2da457adb6dd32047eb1627459a0 (patch) | |
| tree | 246012077cd959563ca372767c319dbbc3345f50 /source/blender/blenkernel | |
| parent | 387d91829d787ac96afbb2b3f86899e0e3346222 (diff) | |
cleanup: style/indentation
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 491fb46bd1f..73f75f4f96d 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 11a6cb7acc3..6157d63047e 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 941344cf21e..06d0627fd2c 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); |