From 265262a5d5e56005d4636dc28f9fce25f4bbed57 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 16 Jun 2012 13:46:20 +0000 Subject: feather option for dilate/erode node - needed for alpha masks so we can (blur in/out), currently only positive values supported. --- source/blender/makesdna/DNA_node_types.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index a10d610c6d4..9bc002b7bbe 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -361,6 +361,7 @@ typedef struct bNodeSocketValueRGBA { #define CMP_NODE_DILATEERODE_STEP 0 #define CMP_NODE_DILATEERODE_DISTANCE_THRESH 1 #define CMP_NODE_DILATEERODE_DISTANCE 2 +#define CMP_NODE_DILATEERODE_DISTANCE_FEATHER 3 typedef struct NodeFrame { short flag; -- cgit v1.2.3 From cf6aefcce67d3968f99ad0f078343850df80700c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 16 Jun 2012 16:50:23 +0000 Subject: shrink the object struct 8 bytes - remove unused ctime variable. --- source/blender/makesdna/DNA_object_types.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 24d33b49db2..83bfec3cc52 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -165,7 +165,7 @@ typedef struct Object { unsigned int lay; /* copy of Base's layer in the scene */ - int pad6; + float sf; /* sf is time-offset */ short flag; /* copy of Base */ short colbits DNA_DEPRECATED; /* deprecated */ @@ -180,8 +180,6 @@ typedef struct Object { int dupon, dupoff, dupsta, dupend; - float sf, ctime; /* sf is time-offset, ctime is the objects current time (XXX timing needs to be revised) */ - /* during realtime */ /* note that inertia is only called inertia for historical reasons -- cgit v1.2.3