[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33814] trunk/blender/source/blender/ editors/transform/transform_constraints.c: Bugfix: new strict code for UI_make_axis_color() caused constraint

[Ton Roosendaal]

Revision: 33814
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33814
Author:   ton
Date:     2010-12-20 14:57:52 +0100 (Mon, 20 Dec 2010)

Log Message:
-----------
Bugfix: new strict code for UI_make_axis_color() caused constraint
lines in Transform to not draw.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_constraints.c

Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c      
2010-12-20 13:32:26 UTC (rev 33813)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c      
2010-12-20 13:57:52 UTC (rev 33814)
@@ -624,9 +624,9 @@
                        convertViewVec(t, vec, (short)(t->mval[0] - 
t->con.imval[0]), (short)(t->mval[1] - t->con.imval[1]));
                        add_v3_v3(vec, tc->center);
 
-                       drawLine(t, tc->center, tc->mtx[0], 'x', 0);
-                       drawLine(t, tc->center, tc->mtx[1], 'y', 0);
-                       drawLine(t, tc->center, tc->mtx[2], 'z', 0);
+                       drawLine(t, tc->center, tc->mtx[0], 'X', 0);
+                       drawLine(t, tc->center, tc->mtx[1], 'Y', 0);
+                       drawLine(t, tc->center, tc->mtx[2], 'Z', 0);
 
                        glColor3ubv((GLubyte *)col2);
 
@@ -646,13 +646,13 @@
                }
 
                if (tc->mode & CON_AXIS0) {
-                       drawLine(t, tc->center, tc->mtx[0], 'x', DRAWLIGHT);
+                       drawLine(t, tc->center, tc->mtx[0], 'X', DRAWLIGHT);
                }
                if (tc->mode & CON_AXIS1) {
-                       drawLine(t, tc->center, tc->mtx[1], 'y', DRAWLIGHT);
+                       drawLine(t, tc->center, tc->mtx[1], 'Y', DRAWLIGHT);
                }
                if (tc->mode & CON_AXIS2) {
-                       drawLine(t, tc->center, tc->mtx[2], 'z', DRAWLIGHT);
+                       drawLine(t, tc->center, tc->mtx[2], 'Z', DRAWLIGHT);
                }
        }
 }
@@ -713,26 +713,26 @@
           Without drawing the first light, users have little clue what they 
are doing.
         */
        if (t->con.mode & CON_AXIS0) {
-               drawLine(t, td->ob->obmat[3], td->axismtx[0], 'x', DRAWLIGHT);
+               drawLine(t, td->ob->obmat[3], td->axismtx[0], 'X', DRAWLIGHT);
        }
        if (t->con.mode & CON_AXIS1) {
-               drawLine(t, td->ob->obmat[3], td->axismtx[1], 'y', DRAWLIGHT);
+               drawLine(t, td->ob->obmat[3], td->axismtx[1], 'Y', DRAWLIGHT);
        }
        if (t->con.mode & CON_AXIS2) {
-               drawLine(t, td->ob->obmat[3], td->axismtx[2], 'z', DRAWLIGHT);
+               drawLine(t, td->ob->obmat[3], td->axismtx[2], 'Z', DRAWLIGHT);
        }
 
        td++;
 
        for(i=1;i<t->total;i++,td++) {
                if (t->con.mode & CON_AXIS0) {
-                       drawLine(t, td->ob->obmat[3], td->axismtx[0], 'x', 0);
+                       drawLine(t, td->ob->obmat[3], td->axismtx[0], 'X', 0);
                }
                if (t->con.mode & CON_AXIS1) {
-                       drawLine(t, td->ob->obmat[3], td->axismtx[1], 'y', 0);
+                       drawLine(t, td->ob->obmat[3], td->axismtx[1], 'Y', 0);
                }
                if (t->con.mode & CON_AXIS2) {
-                       drawLine(t, td->ob->obmat[3], td->axismtx[2], 'z', 0);
+                       drawLine(t, td->ob->obmat[3], td->axismtx[2], 'Z', 0);
                }
        }
 }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs