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:
authorAntony Riakiotakis <kalast@gmail.com>2014-03-04 22:35:39 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-03-04 22:36:03 +0400
commit9ecf73f7036c9d8482d95075916f48f9a7a806c1 (patch)
treed2a35e999babb59f37bfade122e321cd0ea7208f
parent976fd68082cf399a5e694c9604add20b85294c9b (diff)
Follow up to the offset scale fix for texture painting: texture mask had
the same issue.
-rw-r--r--source/blender/blenkernel/intern/brush.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 4b2e791b66e..68da8f1a4d8 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -684,11 +684,8 @@ float BKE_brush_sample_masktex(const Scene *scene, Brush *br,
x /= (br->mask_stencil_dimension[0]);
y /= (br->mask_stencil_dimension[1]);
- x *= mtex->size[0];
- y *= mtex->size[1];
-
- co[0] = x + mtex->ofs[0];
- co[1] = y + mtex->ofs[1];
+ co[0] = x;
+ co[1] = y;
co[2] = 0.0f;
externtex(mtex, co, &intensity,
@@ -744,11 +741,8 @@ float BKE_brush_sample_masktex(const Scene *scene, Brush *br,
y = flen * sinf(angle);
}
- x *= mtex->size[0];
- y *= mtex->size[1];
-
- co[0] = x + mtex->ofs[0];
- co[1] = y + mtex->ofs[1];
+ co[0] = x;
+ co[1] = y;
co[2] = 0.0f;
externtex(mtex, co, &intensity,