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:
authorNicholas Bishop <nicholasbishop@gmail.com>2006-12-12 05:36:21 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2006-12-12 05:36:21 +0300
commit237e7417e733f6942068131a612acb495a6742cf (patch)
tree549d649168d4efaa87e2760e6dfb1c783b62e6b9
parent95c3e8041c708df136da50d4da0fe83e82b8d476 (diff)
Fixed bug #5403, sculpt - alpha brush sizing shows fade even if fade is disabled
-rw-r--r--source/blender/src/sculptmode.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c
index 21d36f587fc..6d2e96a1243 100644
--- a/source/blender/src/sculptmode.c
+++ b/source/blender/src/sculptmode.c
@@ -1279,8 +1279,13 @@ void sculptmode_propset_calctex()
if(G.scene->sculptdata.texrept!=SCULPTREPT_3D)
sculptmode_update_tex();
for(i=0; i<tsz; ++i)
- for(j=0; j<tsz; ++j)
- pd->texdata[i*tsz+j]= simple_strength(sqrt(pow(i-tsz/2,2)+pow(j-tsz/2,2)),tsz/2);
+ for(j=0; j<tsz; ++j) {
+ float magn= sqrt(pow(i-tsz/2,2)+pow(j-tsz/2,2));
+ if(G.scene->sculptdata.texfade)
+ pd->texdata[i*tsz+j]= simple_strength(magn,tsz/2);
+ else
+ pd->texdata[i*tsz+j]= magn < tsz/2 ? 1 : 0;
+ }
if(G.scene->sculptdata.texact != -1 && G.scene->sculptdata.texrndr) {
for(i=0; i<tsz; ++i)
for(j=0; j<tsz; ++j) {