diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-07-19 03:57:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-19 04:24:24 +0300 |
commit | ad7455cd14bc5679ae1333b56beccaf6b1eceff9 (patch) | |
tree | a071b7104f042938767c2256c8e0e9328525bb63 /source | |
parent | 83883ae66ad3231840d483ff091727b33d2f355b (diff) |
Cleanup: remove unused MTex.pmapto, pmaptoneg & defines
These have not been in use since 2.57
fafbd9d71b95776d1c7583476de74fccefab7f10.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 18 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 3 |
3 files changed, 3 insertions, 22 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index db1fbb56125..f2f3c5d4ca6 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4418,12 +4418,12 @@ void psys_get_texture( if ((event & mtex->mapto) & PAMAP_TIME) { /* the first time has to set the base value for time regardless of blend mode */ - if ((setvars & MAP_PA_TIME) == 0) { + if ((setvars & PAMAP_TIME) == 0) { int flip = (mtex->timefac < 0.0f); float timefac = fabsf(mtex->timefac); ptex->time *= 1.0f - timefac; ptex->time += timefac * ((flip) ? 1.0f - value : value); - setvars |= MAP_PA_TIME; + setvars |= PAMAP_TIME; } else { ptex->time = texture_value_blend(def, ptex->time, value, mtex->timefac, blend); diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index b7354aaa724..58c1bc6c5fd 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -295,24 +295,6 @@ typedef struct Material { #define MAP_COL (1 << 0) #define MAP_ALPHA (1 << 7) -/* pmapto */ -/* init */ -#define MAP_PA_INIT ((1 << 5) - 1) -#define MAP_PA_TIME (1 << 0) -#define MAP_PA_LIFE (1 << 1) -#define MAP_PA_DENS (1 << 2) -#define MAP_PA_SIZE (1 << 3) -#define MAP_PA_LENGTH (1 << 4) -/* reset */ -#define MAP_PA_IVEL (1 << 5) -/* physics */ -#define MAP_PA_PVEL (1 << 6) -/* path cache */ -#define MAP_PA_CLUMP (1 << 7) -#define MAP_PA_KINK (1 << 8) -#define MAP_PA_ROUGH (1 << 9) -#define MAP_PA_FREQ (1 << 10) - /* pr_type */ #define MA_FLAT 0 #define MA_SPHERE 1 diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 2308f04c4c7..ee33e8666ec 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -54,11 +54,10 @@ typedef struct MTex { float ofs[3], size[3], rot, random_angle; char _pad0[2]; - short colormodel, pmapto, pmaptoneg; + short colormodel; short normapspace, which_output; float r, g, b, k; float def_var; - char _pad1[4]; /* common */ float colfac, varfac; |