blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: remove unused MTex.pmapto, pmaptoneg & defines 

These have not been in use since 2.57
fafbd9d71b.
This commit is contained in:
Campbell Barton 2021-07-19 10:57:39 +10:00
parent 83883ae66a
commit ad7455cd14
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/particle.c
View File

@ -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);

18
source/blender/makesdna/DNA_material_types.h
View File

@ -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

3
source/blender/makesdna/DNA_texture_types.h
View File

@ -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;