archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: color/bw conversion - use BLI color function.

Browse Source 
change modifier to use the average of the RGB since perceptual conversion isn't really needed for modifiers.
This commit is contained in:
Campbell Barton
2012-05-09 10:48:24 +00:00
parent a2ed2b36f3
commit 385e5eb92e
7 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/modifiers/intern/MOD_util.c
View File

@@ -77,14 +77,15 @@ void get_texture_value(Tex *texture, float *tex_co, TexResult *texres)
result_type = multitex_ext_safe(texture, tex_co, texres);
/* if the texture gave an RGB value, we assume it didn't give a valid
* intensity, so calculate one (formula from do_material_tex).
* intensity, since this is in the context of modifiers don't use perceptual color conversion.
* if the texture didn't give an RGB value, copy the intensity across
*/
if (result_type & TEX_RGB)
texres->tin = (0.35f * texres->tr + 0.45f * texres->tg
+ 0.2f * texres->tb);
else
texres->tr = texres->tg = texres->tb = texres->tin;
if (result_type & TEX_RGB) {
texres->tin= (1.0f / 3.0f) * (texres->tr + texres->tg + texres->tb);
}
else {
copy_v3_fl(&texres->tr, texres->tin);
}
}
void get_texture_coords(MappingInfoModifierData *dmd, Object *ob,