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:
authorLukas Toenne <lukas.toenne@googlemail.com>2011-02-10 23:54:02 +0300
committerLukas Toenne <lukas.toenne@googlemail.com>2011-02-10 23:54:02 +0300
commit46bb5643b7660033bc0d15c5fcc752324a1b519f (patch)
treeae9f798b1ce120af18a1b3bb98e876349b605000 /source/blender/makesdna/DNA_node_types.h
parentcbe53cc48d5e4460c2d04d1344bd30a882b2cadb (diff)
Different method for blur node aspect correction. Now the user can still set different sizes for x/y blurring in relative mode, but choose to use aspect correction on either of the axes.
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r--source/blender/makesdna/DNA_node_types.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 85523c3369f..5fbbf4338c4 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -216,12 +216,11 @@ typedef struct NodeImageAnim {
typedef struct NodeBlurData {
short sizex, sizey;
- short samples, maxspeed, minspeed, size_type;
+ short samples, maxspeed, minspeed, relative, aspect;
+ short curved;
float fac, percentx, percenty;
short filtertype;
char bokeh, gamma;
- short curved;
- short pad;
int image_in_width, image_in_height; /* needed for absolute/relative conversions */
} NodeBlurData;
@@ -336,10 +335,8 @@ typedef struct TexNodeOutput {
#define CMP_NODE_CHANNEL_MATTE_CS_YUV 3
#define CMP_NODE_CHANNEL_MATTE_CS_YCC 4
-/* comp blur relative filter size */
-#define CMP_NODE_BLUR_SIZE_PIXEL 0
-#define CMP_NODE_BLUR_SIZE_WIDTH 1
-#define CMP_NODE_BLUR_SIZE_HEIGHT 2
-#define CMP_NODE_BLUR_SIZE_BOTH 3
+#define CMP_NODE_BLUR_ASPECT_NONE 0
+#define CMP_NODE_BLUR_ASPECT_Y 1
+#define CMP_NODE_BLUR_ASPECT_X 2
#endif