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
path: root/source
diff options
context:
space:
mode:
authorRobert Holcomb <bob_holcomb@hotmail.com>2007-02-07 06:40:59 +0300
committerRobert Holcomb <bob_holcomb@hotmail.com>2007-02-07 06:40:59 +0300
commit00cdff156f361bb3b07459355745fa6125383c0d (patch)
treee571acc313ed8547d0fc743958c7656bef8305b0 /source
parenta10ed3b0de13831f8eb17c1ba779fd4347f177b3 (diff)
When converting a VAL buffer to RGBA the alpha is also set to the value in the VAL buffer. This should be set to 1.0f as in the other conversions or it results in an unevenly transparent buffer. Corrected to result in an opaque buffer.
BKE_node.h commit is in error, but harmless (oops).
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_node.h1
-rw-r--r--source/blender/blenkernel/intern/node_composite.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 53b7cb9751d..8173d215362 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -252,6 +252,7 @@ void set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, str
#define CMP_NODE_COMBHSVA 246
#define CMP_NODE_MATH 247
#define CMP_NODE_LUMA_MATTE 248
+#define CMP_NODE_VIEW_LEVELS 249
/* filter types */
diff --git a/source/blender/blenkernel/intern/node_composite.c b/source/blender/blenkernel/intern/node_composite.c
index ab51497550c..b427fc66b61 100644
--- a/source/blender/blenkernel/intern/node_composite.c
+++ b/source/blender/blenkernel/intern/node_composite.c
@@ -324,7 +324,7 @@ static CompBuf *typecheck_compbuf(CompBuf *inbuf, int type)
outrf[0]= inrf[0];
outrf[1]= inrf[0];
outrf[2]= inrf[0];
- outrf[3]= inrf[0];
+ outrf[3]= 1.0f;
}
}
else if(inbuf->type==CB_VEC2) {