diff options
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 042645eeb76..af6adbecd83 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -84,8 +84,9 @@ typedef struct MTex { /* particles */ float timefac, lengthfac, clumpfac, dampfac; - float kinkfac, roughfac, padensfac, gravityfac; + float kinkfac, kinkampfac, roughfac, padensfac, gravityfac; float lifefac, sizefac, ivelfac, fieldfac; + int pad2; /* lamp */ float shadowfac; @@ -175,8 +176,8 @@ typedef struct VoxelData { short flag; short extend; short smoked_type; + short hair_type; short data_type; - short pad; int _pad; struct Object *object; /* for rendering smoke sims */ @@ -617,6 +618,7 @@ enum { #define TEX_VD_RAW_16BIT 2 #define TEX_VD_IMAGE_SEQUENCE 3 #define TEX_VD_SMOKE 4 +#define TEX_VD_HAIR 5 /* for voxels which use VoxelData->source_path */ #define TEX_VD_IS_SOURCE_PATH(_format) (ELEM(_format, TEX_VD_BLENDERVOXEL, TEX_VD_RAW_8BIT, TEX_VD_RAW_16BIT)) @@ -626,6 +628,11 @@ enum { #define TEX_VD_SMOKEVEL 2 #define TEX_VD_SMOKEFLAME 3 +#define TEX_VD_HAIRDENSITY 0 +#define TEX_VD_HAIRVELOCITY 1 +#define TEX_VD_HAIRENERGY 2 +#define TEX_VD_HAIRRESTDENSITY 3 + /* data_type */ #define TEX_VD_INTENSITY 0 #define TEX_VD_RGBA_PREMUL 1 |