[Bf-blender-cvs] [6be95f87787] master: Fix T53357: harmless assert after recent addition of render time pass.
Brecht Van Lommel
noreply at git.blender.org
Thu Nov 23 17:40:59 CET 2017
Commit: 6be95f87787de68fb55b86968ddeb7c2507bf4f9
Author: Brecht Van Lommel
Date: Thu Nov 23 17:00:18 2017 +0100
Branches: master
https://developer.blender.org/rB6be95f87787de68fb55b86968ddeb7c2507bf4f9
Fix T53357: harmless assert after recent addition of render time pass.
===================================================================
M intern/cycles/render/buffers.cpp
===================================================================
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index 2fa297371f4..5c7729ec89f 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -236,10 +236,17 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int
int size = params.width*params.height;
- if(components == 1) {
+ if(components == 1 && type == PASS_RENDER_TIME) {
+ /* Render time is not stored by kernel, but measured per tile. */
+ float val = (float) (1000.0 * render_time/(params.width * params.height * sample));
+ for(int i = 0; i < size; i++, pixels++) {
+ pixels[0] = val;
+ }
+ }
+ else if(components == 1) {
assert(pass.components == components);
- /* scalar */
+ /* Scalar */
if(type == PASS_DEPTH) {
for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
float f = *in;
@@ -264,12 +271,6 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int
}
}
#endif
- else if(type == PASS_RENDER_TIME) {
- float val = (float) (1000.0 * render_time/(params.width * params.height * sample));
- for(int i = 0; i < size; i++, pixels++) {
- pixels[0] = val;
- }
- }
else {
for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
float f = *in;
More information about the Bf-blender-cvs
mailing list