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

Fix texture sampling getting srgb color after fix for subsurf sampling.

Browse Source
This commit is contained in:
Antony Riakiotakis
2015-01-29 19:34:51 +01:00
parent ebc064f5c0
commit cff7ef6ee8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,15 +373,15 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c
} }
/* returns 0 if not found, otherwise 1 */ /* returns 0 if not found, otherwise 1 */
static int imapaint_pick_face(ViewContext *vc, const int mval[2], unsigned int *r_index, unsigned int totface) static int imapaint_pick_face(ViewContext *vc, const int mval[2], unsigned int *r_index, unsigned int totpoly)
{ {
if (totface == 0) if (totpoly == 0)
return 0; return 0;
/* sample only on the exact position */ /* sample only on the exact position */
*r_index = view3d_sample_backbuf(vc, mval[0], mval[1]); *r_index = view3d_sample_backbuf(vc, mval[0], mval[1]);
if ((*r_index) == 0 || (*r_index) > (unsigned int)totface) { if ((*r_index) == 0 || (*r_index) > (unsigned int)totpoly) {
return 0; return 0;
} }
@@ -456,7 +456,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
ViewContext vc; ViewContext vc;
const int mval[2] = {x, y}; const int mval[2] = {x, y};
unsigned int faceindex; unsigned int faceindex;
unsigned int totface = me->totface; unsigned int totpoly = me->totpoly;
MTFace *dm_mtface = dm->getTessFaceDataArray(dm, CD_MTFACE); MTFace *dm_mtface = dm->getTessFaceDataArray(dm, CD_MTFACE);
if (dm_mtface) { if (dm_mtface) {
@@ -464,7 +464,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
view3d_operator_needs_opengl(C); view3d_operator_needs_opengl(C);
if (imapaint_pick_face(&vc, mval, &faceindex, totface)) { if (imapaint_pick_face(&vc, mval, &faceindex, totpoly)) {
Image *image; Image *image;
if (use_material) if (use_material)