Commit: 7bad5e0d185503ec438ed48af4fbd487adf581cc
Author: Dalai Felinto
Date: Tue Aug 4 16:01:26 2020 +0200
Branches: master
https://developer.blender.org/rB7bad5e0d185503ec438ed48af4fbd487adf581cc
Cleanup: clang-format after recent cleanup commit
Remember to run `make format` after any massive cleanup please.
This "issue" introduced on 901ee66ea1cb.
===================================================================
M source/blender/ikplugin/BIK_api.h
M source/blender/imbuf/intern/stereoimbuf.c
===================================================================
diff --git a/source/blender/ikplugin/BIK_api.h
b/source/blender/ikplugin/BIK_api.h
index 99f68983c21..38a48864cc0 100644
--- a/source/blender/ikplugin/BIK_api.h
+++ b/source/blender/ikplugin/BIK_api.h
@@ -37,9 +37,9 @@ struct bPose;
struct bPoseChannel;
void BIK_init_tree(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- float ctime);
+ struct Scene *scene,
+ struct Object *ob,
+ float ctime);
void BIK_execute_tree(struct Depsgraph *depsgraph,
struct Scene *scene,
struct Object *ob,
diff --git a/source/blender/imbuf/intern/stereoimbuf.c
b/source/blender/imbuf/intern/stereoimbuf.c
index 0d532b0e1fb..247122065de 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -670,16 +670,16 @@ static void imb_stereo3d_squeeze_rect(
/*************************** preparing to call the write functions
**************************/
static void imb_stereo3d_data_init(Stereo3DData *s3d_data,
- const bool is_float,
- const size_t x,
- const size_t y,
- const size_t channels,
- int *rect_left,
- int *rect_right,
- int *rect_stereo,
- float *rectf_left,
- float *rectf_right,
- float *rectf_stereo)
+ const bool is_float,
+ const size_t x,
+ const size_t y,
+ const size_t channels,
+ int *rect_left,
+ int *rect_right,
+ int *rect_stereo,
+ float *rectf_left,
+ float *rectf_right,
+ float *rectf_stereo)
{
s3d_data->is_float = is_float;
s3d_data->x = x;
@@ -760,16 +760,16 @@ ImBuf *IMB_stereo3d_ImBuf(ImageFormatData *im_format,
ImBuf *ibuf_left, ImBuf *i
ibuf_stereo->flags = ibuf_left->flags;
imb_stereo3d_data_init(&s3d_data,
- is_float,
- ibuf_left->x,
- ibuf_left->y,
- 4,
- (int *)ibuf_left->rect,
- (int *)ibuf_right->rect,
- (int *)ibuf_stereo->rect,
- ibuf_left->rect_float,
- ibuf_right->rect_float,
- ibuf_stereo->rect_float);
+ is_float,
+ ibuf_left->x,
+ ibuf_left->y,
+ 4,
+ (int *)ibuf_left->rect,
+ (int *)ibuf_right->rect,
+ (int *)ibuf_stereo->rect,
+ ibuf_left->rect_float,
+ ibuf_right->rect_float,
+ ibuf_stereo->rect_float);
imb_stereo3d_write_doit(&s3d_data, &im_format->stereo3d_format);
imb_stereo3d_squeeze_ImBuf(ibuf_stereo, &im_format->stereo3d_format,
ibuf_left->x, ibuf_left->y);
@@ -1287,16 +1287,16 @@ void IMB_ImBufFromStereo3d(Stereo3dFormat *s3d,
imb_stereo3d_unsqueeze_ImBuf(ibuf_stereo3d, s3d, width, height);
imb_stereo3d_data_init(&s3d_data,
- is_float,
- ibuf_left->x,
- ibuf_left->y,
- 4,
- (int *)ibuf_left->rect,
- (int *)ibuf_right->rect,
- (int *)ibuf_stereo3d->rect,
- ibuf_left->rect_float,
- ibuf_right->rect_float,
- ibuf_stereo3d->rect_float);
+ is_float,
+ ibuf_left->x,
+ ibuf_left->y,
+ 4,
+ (int *)ibuf_left->rect,
+ (int *)ibuf_right->rect,
+ (int *)ibuf_stereo3d->rect,
+ ibuf_left->rect_float,
+ ibuf_right->rect_float,
+ ibuf_stereo3d->rect_float);
imb_stereo3d_read_doit(&s3d_data, s3d);
@@ -1311,16 +1311,16 @@ void IMB_ImBufFromStereo3d(Stereo3dFormat *s3d,
}
imb_stereo3d_data_init(&s3d_data,
- is_float,
- ibuf_left->x,
- ibuf_left->y,
- 1,
- (int *)ibuf_left->zbuf,
- (int *)ibuf_right->zbuf,
- (int *)ibuf_stereo3d->zbuf,
- ibuf_left->zbuf_float,
- ibuf_right->zbuf_float,
- ibuf_stereo3d->zbuf_float);
+ is_float,
+ ibuf_left->x,
+ ibuf_left->y,
+ 1,
+ (int *)ibuf_left->zbuf,
+ (int *)ibuf_right->zbuf,
+ (int *)ibuf_stereo3d->zbuf,
+ ibuf_left->zbuf_float,
+ ibuf_right->zbuf_float,
+ ibuf_stereo3d->zbuf_float);
imb_stereo3d_read_doit(&s3d_data, s3d);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
