Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-03-24 05:19:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-24 05:19:55 +0400
commit92d7955d133bd70e8cf01321fe34761b534be172 (patch)
treee5ca087d578e1ddc0f1021d986bbbd2d2efed8c7 /source/blender/render
parentd9eadf442e9f6574cbece6917916b9f7c4c7dc5e (diff)
fix for struct definition building with msvc2008 and some style cleanup.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c2
-rw-r--r--source/blender/render/intern/source/render_result.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 9f44e42469b..8306a8a63a7 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -877,7 +877,7 @@ static void *do_render_thread(void *thread_v)
do_part_thread(pa);
BLI_thread_queue_push(thread->donequeue, pa);
- if(R.test_break(R.tbh))
+ if (R.test_break(R.tbh))
break;
}
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index ab0f16c8c2a..a758c578340 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1092,7 +1092,7 @@ ImBuf *render_result_rect_to_ibuf(RenderResult *rr, RenderData *rd)
if (BKE_imtype_valid_depths(rd->im_format.imtype) & (R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16 | R_IMF_CHAN_DEPTH_24 | R_IMF_CHAN_DEPTH_32)) {
IMB_float_from_rect(ibuf);
}
- else {
+ else {
/* ensure no float buffer remained from previous frame */
ibuf->rect_float = NULL;
}