diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-17 06:18:40 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-17 06:18:40 +0400 |
commit | bba80ed7afa8ccea14310f35f767749f5d04207e (patch) | |
tree | 4c1d221020f9f07d190cb37e44df0de42f2b61a9 /source/blender/editors | |
parent | f789d0b606d6d11af2987cb50bca59d53d9896d2 (diff) |
Cleanup
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index e2d4af45fb9..7eb3b5f8882 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -1202,7 +1202,7 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda float mat[4][4]; mul_m4_m4m4(mat, rp->viewmat, object->obmat); invert_m4_m4(object->imat_ren, mat); - } + } } use_border = render_view3d_disprect(rp->scene, rp->ar, rp->v3d, diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 7344d4012ed..f402f1cb4c8 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1486,7 +1486,9 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI else { /* TODO, better solution, if a 24bit image is painted onto it may contain alpha */ if ((simopts->im_format.planes == R_IMF_PLANES_RGBA) && - (ibuf->userflags & IB_BITMAPDIRTY)) { /* it has been painted onto */ + /* it has been painted onto */ + (ibuf->userflags & IB_BITMAPDIRTY)) + { /* checks each pixel, not ideal */ ibuf->planes = BKE_imbuf_alpha_test(ibuf) ? R_IMF_PLANES_RGBA : R_IMF_PLANES_RGB; } |