Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: texture scaling for sculpting is different between overlay and

Browse Source 
stroke. The reason is that we use a different sampling function.
Reported by Michalis Zissiou, thanks!
This commit is contained in:
Antony Riakiotakis
2013-04-16 16:22:26 +00:00
parent c9fc3874d6
commit 858c7acd5b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/sculpt_paint/paint_utils.c
View File

@@ -179,16 +179,13 @@ float paint_calc_object_space_radius(ViewContext *vc, const float center[3],
float paint_get_tex_pixel(MTex *mtex, float u, float v, struct ImagePool *pool) float paint_get_tex_pixel(MTex *mtex, float u, float v, struct ImagePool *pool)
{ {
TexResult texres = {0}; float intensity, rgba[4];
float co[3] = {u, v, 0.0f}; float co[3] = {u, v, 0.0f};
int hasrgb;
hasrgb = multitex_ext(mtex->tex, co, NULL, NULL, 0, &texres, pool); externtex(mtex, co, &intensity,
rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool);
if (hasrgb & TEX_RGB) return intensity;
texres.tin = rgb_to_grayscale(&texres.tr) * texres.ta;
return texres.tin;
} }
void paint_get_tex_pixel_col(MTex *mtex, float u, float v, float rgba[4], struct ImagePool *pool) void paint_get_tex_pixel_col(MTex *mtex, float u, float v, float rgba[4], struct ImagePool *pool)