diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-02 20:17:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-02 20:17:05 +0400 |
| commit | 2f453773f6b4cd0a03f5e2d9876ee250b87871f0 (patch) | |
| tree | 08c4bb2c1c3ee3fe5131e46a4e39b9224ba5c251 /source/blender/editors/gpencil/drawgpencil.c | |
| parent | 02fae3440c8b4b89aa0f9412bc4e0db60a787c13 (diff) | |
| parent | e1594ebb3c52f573a8a6c90f3d30acfb3de6e8a5 (diff) | |
Cycles: svn merge -r41266:41467 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/gpencil/drawgpencil.c')
| -rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 07858f7182c..64da61f8f55 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -580,8 +580,8 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy /* set color, stroke thickness, and point size */ glLineWidth(lthick); - QUATCOPY(color, gpl->color); // just for copying 4 array elements - QUATCOPY(tcolor, gpl->color); // additional copy of color (for ghosting) + copy_v4_v4(color, gpl->color); // just for copying 4 array elements + copy_v4_v4(tcolor, gpl->color); // additional copy of color (for ghosting) glColor4fv(color); glPointSize((float)(gpl->thickness + 2)); |