[Bf-blender-cvs] [f296259] master: Cycles: Expose Clip image extension type
Sergey Sharybin
noreply at git.blender.org
Tue Jul 28 14:46:10 CEST 2015
Commit: f29625922f61c772e01a9bf2902a41bd4e4e264e
Author: Sergey Sharybin
Date: Tue Jul 28 14:39:53 2015 +0200
Branches: master
https://developer.blender.org/rBf29625922f61c772e01a9bf2902a41bd4e4e264e
Cycles: Expose Clip image extension type
This type causes pixels outside of 0..1 coordinate range to become transparent.
===================================================================
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
===================================================================
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 45407d1..1bbd0ab 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -979,6 +979,7 @@ typedef struct NodeSunBeams {
#define SHD_IMAGE_EXTENSION_REPEAT 0
#define SHD_IMAGE_EXTENSION_EXTEND 1
+#define SHD_IMAGE_EXTENSION_CLIP 2
/* image texture */
#define SHD_PROJ_FLAT 0
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 2c86799..105829e 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3626,6 +3626,7 @@ static void def_sh_tex_image(StructRNA *srna)
static EnumPropertyItem prop_image_extension[] = {
{SHD_IMAGE_EXTENSION_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"},
{SHD_IMAGE_EXTENSION_EXTEND, "EXTEND", 0, "Extend", "Extend by repeating edge pixels of the image"},
+ {SHD_IMAGE_EXTENSION_CLIP, "CLIP", 0, "Clip", "Clip to image size and set exterior pixels as transparent"},
{0, NULL, 0, NULL, NULL}
};
More information about the Bf-blender-cvs
mailing list