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:
authorCampbell Barton <ideasman42@gmail.com>2011-11-26 20:29:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-26 20:29:14 +0400
commit3b5bcab09c28163f16d653a5b76dd3192c911007 (patch)
tree8127e7a5ce98641f27d0edd035922f3ddc9de1a3 /source/blender/editors/uvedit/uvedit_draw.c
parentf1996b5601e41602157035b1d91e8386761bd839 (diff)
parentd52a811052c67686845dd1737d42fe65add51d55 (diff)
svn merge ^/trunk/blender -r42139:42172
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_draw.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_draw.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 04eb940393f..539c7cada7a 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -263,7 +263,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
else
areadiff = 1.0f-(area/uvarea);
- weight_to_rgb(areadiff, col, col+1, col+2);
+ weight_to_rgb(col, areadiff);
glColor3fv(col);
glBegin(GL_POLYGON);
@@ -343,19 +343,19 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
* 1.0-powf((1.0-a), 2) */
a = fabsf(uvang1-ang1)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[0]);
a = fabsf(uvang2-ang2)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[1]);
a = fabsf(uvang3-ang3)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[2]);
a = fabsf(uvang4-ang4)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[3]);
@@ -398,15 +398,15 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
glBegin(GL_TRIANGLES);
a = fabsf(uvang1-ang1)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[0]);
a = fabsf(uvang2-ang2)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[1]);
a = fabsf(uvang3-ang3)/(float)M_PI;
- weight_to_rgb(1.0f-powf((1.0f-a), 2.0f), col, col+1, col+2);
+ weight_to_rgb(col, 1.0f-powf((1.0f-a), 2.0f));
glColor3fv(col);
glVertex2fv(tf->uv[2]);
}