[Bf-blender-cvs] [3b691b5] tiles-scheduler: Initialize colors, vectors and values in RenderLayersProg
Jeroen Bakker
noreply at git.blender.org
Wed May 21 16:01:26 CEST 2014
Commit: 3b691b54b1f8edfe666be46f3cb22efe0fa7f2e6
Author: Jeroen Bakker
Date: Mon May 12 18:21:45 2014 +0200
https://developer.blender.org/rB3b691b54b1f8edfe666be46f3cb22efe0fa7f2e6
Initialize colors, vectors and values in RenderLayersProg
===================================================================
M source/blender/compositor/operations/COM_RenderLayersProg.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
index 274502c..0eec027 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@ -89,7 +89,6 @@ void RenderLayersBaseProg::doInterpolation(float output[4], float x, float y, Pi
else
zero_v4(output);
break;
-
}
offset = (iy * width + ix) * this->m_elementsize;
@@ -139,15 +138,15 @@ void RenderLayersBaseProg::executePixelSampled(float output[4], float x, float y
#endif
if (this->m_inputBuffer == NULL) {
- int elemsize = this->m_elementsize;
- if (elemsize == 1) {
- output[0] = 0.0f;
- }
- else if (elemsize == 3) {
- zero_v3(output);
- } else {
- zero_v4(output);
- }
+ int elemsize = this->m_elementsize;
+ if (elemsize == 1) {
+ output[0] = 0.0f;
+ }
+ else if (elemsize == 3) {
+ zero_v3(output);
+ } else {
+ zero_v4(output);
+ }
}
else {
doInterpolation(output, ix, iy, sampler);
More information about the Bf-blender-cvs
mailing list