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:
authorJeroen Bakker <jeroen@blender.org>2022-01-28 15:28:31 +0300
committerJeroen Bakker <jeroen@blender.org>2022-01-28 15:28:31 +0300
commitcdcbdf8ce46d14c753d68ee8dfa533c642376805 (patch)
tree8557864b1f75f6a0a2c80df48692a7723c9e0300 /source/blender/render/intern/texture_pointdensity.c
parent7c48196056c88c17c551e3177ef7b6f276f01d77 (diff)
Remove compilation warnings TexResult.
Diffstat (limited to 'source/blender/render/intern/texture_pointdensity.c')
-rw-r--r--source/blender/render/intern/texture_pointdensity.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c
index 683260f86cb..9abaeb3739f 100644
--- a/source/blender/render/intern/texture_pointdensity.c
+++ b/source/blender/render/intern/texture_pointdensity.c
@@ -687,7 +687,7 @@ static int pointdensity(PointDensity *pd,
static void pointdensity_color(
PointDensity *pd, TexResult *texres, float age, const float vec[3], const float col[3])
{
- texres->tr = texres->tg = texres->tb = texres->ta = 1.0f;
+ copy_v4_fl(texres->trgba, 1.0f);
if (pd->source == TEX_PD_PSYS) {
float rgba[4];
@@ -697,9 +697,9 @@ static void pointdensity_color(
if (pd->coba) {
if (BKE_colorband_evaluate(pd->coba, age, rgba)) {
texres->talpha = true;
- copy_v3_v3(&texres->tr, rgba);
+ copy_v3_v3(texres->trgba, rgba);
texres->tin *= rgba[3];
- texres->ta = texres->tin;
+ texres->trgba[3] = texres->tin;
}
}
break;
@@ -709,17 +709,17 @@ static void pointdensity_color(
if (pd->coba) {
if (BKE_colorband_evaluate(pd->coba, speed, rgba)) {
texres->talpha = true;
- copy_v3_v3(&texres->tr, rgba);
+ copy_v3_v3(texres->trgba, rgba);
texres->tin *= rgba[3];
- texres->ta = texres->tin;
+ texres->trgba[3] = texres->tin;
}
}
break;
}
case TEX_PD_COLOR_PARTVEL:
texres->talpha = true;
- mul_v3_v3fl(&texres->tr, vec, pd->speed_scale);
- texres->ta = texres->tin;
+ mul_v3_v3fl(texres->trgba, vec, pd->speed_scale);
+ texres->trgba[3] = texres->tin;
break;
case TEX_PD_COLOR_CONSTANT:
default:
@@ -732,24 +732,24 @@ static void pointdensity_color(
switch (pd->ob_color_source) {
case TEX_PD_COLOR_VERTCOL:
texres->talpha = true;
- copy_v3_v3(&texres->tr, col);
- texres->ta = texres->tin;
+ copy_v3_v3(texres->trgba, col);
+ texres->trgba[3] = texres->tin;
break;
case TEX_PD_COLOR_VERTWEIGHT:
texres->talpha = true;
if (pd->coba && BKE_colorband_evaluate(pd->coba, col[0], rgba)) {
- copy_v3_v3(&texres->tr, rgba);
+ copy_v3_v3(texres->trgba, rgba);
texres->tin *= rgba[3];
}
else {
- copy_v3_v3(&texres->tr, col);
+ copy_v3_v3(texres->trgba, col);
}
- texres->ta = texres->tin;
+ texres->trgba[3] = texres->tin;
break;
case TEX_PD_COLOR_VERTNOR:
texres->talpha = true;
- copy_v3_v3(&texres->tr, col);
- texres->ta = texres->tin;
+ copy_v3_v3(texres->trgba, col);
+ texres->trgba[3] = texres->tin;
break;
case TEX_PD_COLOR_CONSTANT:
default:
@@ -915,7 +915,7 @@ static void point_density_sample_func(void *__restrict data_v,
pointdensity(pd, texvec, &texres, vec, &age, col);
pointdensity_color(pd, &texres, age, vec, col);
- copy_v3_v3(&values[index * 4 + 0], &texres.tr);
+ copy_v3_v3(&values[index * 4 + 0], texres.trgba);
values[index * 4 + 3] = texres.tin;
}
}