diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 16:57:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 16:57:37 +0400 |
| commit | 07019829339242d5155e08daddec4366c6def907 (patch) | |
| tree | c0ab3791d4d4d2e989fd2fece114e722efdc7dcb /source/blender/editors/gpencil | |
| parent | f5cf23888490c85cb7a23f05259daff6e369cbac (diff) | |
| parent | 0d63bb005ff7c45ca0ebcfbe4eaf1215dfe2d3e2 (diff) | |
svn merge -r41329:41335 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 1 |
2 files changed, 3 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)); diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 6617ce776b7..ff3b69c2bf6 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -48,6 +48,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_gpencil_types.h" +#include "DNA_windowmanager_types.h" #include "UI_view2d.h" |