[Bf-blender-cvs] [cdcbdf8ce46] blender-v3.1-release: Remove compilation warnings TexResult.
Jeroen Bakker
noreply at git.blender.org
Fri Jan 28 13:44:51 CET 2022
Commit: cdcbdf8ce46d14c753d68ee8dfa533c642376805
Author: Jeroen Bakker
Date: Fri Jan 28 13:28:31 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rBcdcbdf8ce46d14c753d68ee8dfa533c642376805
Remove compilation warnings TexResult.
===================================================================
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/texture.c
M source/blender/blenlib/intern/math_interp.c
M source/blender/compositor/operations/COM_TextureOperation.cc
M source/blender/editors/render/render_preview.cc
M source/blender/makesrna/intern/rna_texture_api.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_volume_displace.cc
M source/blender/modifiers/intern/MOD_weightvg_util.c
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_sample_texture.cc
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/nodes/texture/nodes/node_texture_proc.c
M source/blender/nodes/texture/nodes/node_texture_texture.c
M source/blender/render/RE_texture.h
M source/blender/render/intern/texture_common.h
M source/blender/render/intern/texture_image.c
M source/blender/render/intern/texture_pointdensity.c
M source/blender/render/intern/texture_procedural.c
===================================================================
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 64e0427a810..ef789d3e39b 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1518,7 +1518,7 @@ static void dynamic_paint_set_init_color_tex_to_vcol_cb(
multitex_ext_safe(tex, uv, &texres, pool, scene_color_manage, false);
if (texres.tin > pPoint[vert].color[3]) {
- copy_v3_v3(pPoint[vert].color, &texres.tr);
+ copy_v3_v3(pPoint[vert].color, texres.trgba);
pPoint[vert].color[3] = texres.tin;
}
}
@@ -1559,7 +1559,7 @@ static void dynamic_paint_set_init_color_tex_to_imseq_cb(
multitex_ext_safe(tex, uv_final, &texres, NULL, scene_color_manage, false);
/* apply color */
- copy_v3_v3(pPoint[i].color, &texres.tr);
+ copy_v3_v3(pPoint[i].color, texres.trgba);
pPoint[i].color[3] = texres.tin;
}
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index bbf9e9edfd2..1f1915f60ca 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -908,9 +908,9 @@ static void do_texture_effector(EffectorCache *eff,
eff->pd->tex, tex_co, NULL, NULL, 0, result, 0, NULL, scene_color_manage, false);
if (hasrgb && mode == PFIELD_TEX_RGB) {
- force[0] = (0.5f - result->tr) * strength;
- force[1] = (0.5f - result->tg) * strength;
- force[2] = (0.5f - result->tb) * strength;
+ force[0] = (0.5f - result->trgba[0]) * strength;
+ force[1] = (0.5f - result->trgba[1]) * strength;
+ force[2] = (0.5f - result->trgba[2]) * strength;
}
else if (nabla != 0) {
strength /= nabla;
@@ -933,7 +933,8 @@ static void do_texture_effector(EffectorCache *eff,
/* generate intensity if texture only has rgb value */
if (hasrgb & TEX_RGB) {
for (int i = 0; i < 4; i++) {
- result[i].tin = (1.0f / 3.0f) * (result[i].tr + result[i].tg + result[i].tb);
+ result[i].tin = (1.0f / 3.0f) *
+ (result[i].trgba[0] + result[i].trgba[1] + result[i].trgba[2]);
}
}
force[0] = (result[0].tin - result[1].tin) * strength;
@@ -943,12 +944,12 @@ static void do_texture_effector(EffectorCache *eff,
else { /*PFIELD_TEX_CURL*/
float dbdy, dgdz, drdz, dbdx, dgdx, drdy;
- dbdy = result[2].tb - result[0].tb;
- dgdz = result[3].tg - result[0].tg;
- drdz = result[3].tr - result[0].tr;
- dbdx = result[1].tb - result[0].tb;
- dgdx = result[1].tg - result[0].tg;
- drdy = result[2].tr - result[0].tr;
+ dbdy = result[2].trgba[2] - result[0].trgba[2];
+ dgdz = result[3].trgba[1] - result[0].trgba[1];
+ drdz = result[3].trgba[0] - result[0].trgba[0];
+ dbdx = result[1].trgba[2] - result[0].trgba[2];
+ dgdx = result[1].trgba[1] - result[0].trgba[1];
+ drdy = result[2].trgba[0] - result[0].trgba[0];
force[0] = (dbdy - dgdz) * strength;
force[1] = (drdz - dbdx) * strength;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 37d5d732a70..c37e2fb6144 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -723,10 +723,10 @@ void BKE_texture_get_value_ex(const Scene *scene,
* if the texture didn't give an RGB value, copy the intensity across
*/
if (result_type & TEX_RGB) {
- texres->tin = (1.0f / 3.0f) * (texres->tr + texres->tg + texres->tb);
+ texres->tin = (1.0f / 3.0f) * (texres->trgba[0] + texres->trgba[1] + texres->trgba[2]);
}
else {
- copy_v3_fl(&texres->tr, texres->tin);
+ copy_v3_fl(texres->trgba, texres->tin);
}
}
diff --git a/source/blender/blenlib/intern/math_interp.c b/source/blender/blenlib/intern/math_interp.c
index 54beb74abca..7225ca5fc94 100644
--- a/source/blender/blenlib/intern/math_interp.c
+++ b/source/blender/blenlib/intern/math_interp.c
@@ -709,6 +709,6 @@ void BLI_ewa_filter(const int width,
/* d should hopefully never be zero anymore */
d = 1.0f / d;
mul_v3_fl(result, d);
- /* clipping can be ignored if alpha used, texr->ta already includes filtered edge */
+ /* clipping can be ignored if alpha used, texr->trgba[3] already includes filtered edge */
result[3] = use_alpha ? result[3] * d : 1.0f;
}
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc
index a4990993d73..069d00b5e66 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cc
+++ b/source/blender/compositor/operations/COM_TextureOperation.cc
@@ -133,11 +133,9 @@ void TextureBaseOperation::execute_pixel_sampled(float output[4],
retval = multitex_ext(
texture_, vec, nullptr, nullptr, 0, &texres, thread_id, pool_, scene_color_manage_, false);
- output[3] = texres.talpha ? texres.ta : texres.tin;
+ output[3] = texres.talpha ? texres.trgba[3] : texres.tin;
if (retval & TEX_RGB) {
- output[0] = texres.tr;
- output[1] = texres.tg;
- output[2] = texres.tb;
+ copy_v3_v3(output, texres.trgba);
}
else {
output[0] = output[1] = output[2] = output[3];
@@ -186,11 +184,9 @@ void TextureBaseOperation::update_memory_buffer_partial(MemoryBuffer *output,
scene_color_manage_,
false);
- it.out[3] = tex_result.talpha ? tex_result.ta : tex_result.tin;
+ it.out[3] = tex_result.talpha ? tex_result.trgba[3] : tex_result.tin;
if (retval & TEX_RGB) {
- it.out[0] = tex_result.tr;
- it.out[1] = tex_result.tg;
- it.out[2] = tex_result.tb;
+ copy_v3_v3(it.out, tex_result.trgba);
}
else {
it.out[0] = it.out[1] = it.out[2] = it.out[3];
diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index 79c3b2f7ac6..df078bbd890 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -1061,11 +1061,11 @@ static void shader_preview_texture(ShaderPreview *sp, Tex *tex, Scene *sce, Rend
/* Evaluate texture at tex_coord. */
TexResult texres = {0};
BKE_texture_get_value_ex(sce, tex, tex_coord, &texres, img_pool, color_manage);
-
- rect_float[0] = texres.tr;
- rect_float[1] = texres.tg;
- rect_float[2] = texres.tb;
- rect_float[3] = texres.talpha ? texres.ta : 1.0f;
+ copy_v4_fl4(rect_float,
+ texres.trgba[0],
+ texres.trgba[1],
+ texres.trgba[2],
+ texres.talpha ? texres.trgba[3] : 1.0f);
rect_float += 4;
}
diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c
index 0920fe6679a..2a4cdaebcee 100644
--- a/source/blender/makesrna/intern/rna_texture_api.c
+++ b/source/blender/makesrna/intern/rna_texture_api.c
@@ -32,6 +32,7 @@
# include "BKE_context.h"
# include "BKE_global.h"
+# include "BLI_math.h"
# include "DNA_scene_types.h"
# include "IMB_imbuf.h"
# include "IMB_imbuf_types.h"
@@ -40,14 +41,12 @@
static void texture_evaluate(struct Tex *tex, float value[3], float r_color[4])
{
- TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
+ TexResult texres = {0.0f};
/* TODO(sergey): always use color management now. */
multitex_ext(tex, value, NULL, NULL, 1, &texres, 0, NULL, true, false);
- r_color[0] = texres.tr;
- r_color[1] = texres.tg;
- r_color[2] = texres.tb;
+ copy_v3_v3(r_color, texres.trgba);
r_color[3] = texres.tin;
}
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 010292d2ebb..c81e6cafa39 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -262,9 +262,9 @@ static void displaceModifier_do_task(void *__restrict userdata,
}
break;
case MOD_DISP_DIR_RGB_XYZ:
- local_vec[0] = texres.tr - dmd->midlevel;
- local_vec[1] = texres.tg - dmd->midlevel;
- local_vec[2] = texres.tb - dmd->midlevel;
+ local_vec[0] = texres.trgba[0] - dmd->midlevel;
+ local_vec[1] = texres.trgba[1] - dmd->midlevel;
+ local_vec[2] = texres.trgba[2] - dmd->midlevel;
if (use_global_direction) {
mul_transposed_mat3_m4_v3(data->local_mat, local_vec);
}
diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc
index a1ca29f454c..af3a502162d 100644
--- a/source/blender/modifiers/intern/MOD_volume_displace.cc
+++ b/source/blender/modifiers/intern/MOD_volume_displace.cc
@@ -183,7 +183,7 @@ template<typename GridType> struct DisplaceOp {
TexResult texture_result = {0};
BKE_texture_get_value(
nullptr, this->texture, const_cast<float *>(pos.asV()), &texture_result, false);
- return {texture_result.tr, texture_result.tg, texture_result.tb};
+ return {texture_result.trgba[0], texture_result.trgba[1], texture_result.trgba[2]};
}
};
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c
index cd9e5162527..eedaea9d403 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@@ -186,28 +186,32 @@ void weightvg_do_mask(const ModifierEvalContext *ctx,
org_w[i] = (new_w[i] * texres.tin * fact) + (org_w[i] * (1.0f - (texres.tin * fact)));
break;
case MOD_WVG_MASK_TEX_USE_RED:
- org_w[i] = (new_w[i] * texres.tr * fact) + (org_w[i] * (1.0f - (texres.tr * fact)));
+ org_w[i] = (new_w[i] * texres.trgba[0] * fact) +
+ (org_w[i] * (1.0f - (texres.trgba[0] * fact)));
break;
case MOD_WVG_MASK_TEX_USE_GREEN:
- org_w[i] = (new_w[i] * texres.tg * fact) + (org_w[i] * (1.0f - (texres.tg * fact)));
+ org_w[i] = (new_w[i] * texres.trgba[1] * fact) +
+ (org_w[i] * (1.0f - (texres.trgba[1] * fact)));
break;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list