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-03-28 06:34:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-03-28 06:34:55 +0400
commitac1cb5ee055840ba3481b8ad490e3be2a6a49cf2 (patch)
treea24cd7905f6ab5e90d2926b822f9753598198e8f /source/blender/editors/gpencil
parentcf40220e54e32cf52931e461b928f26571fc2f4f (diff)
- quiet new warnings with gcc 4.6
- use BLI math funcs for normal float/short conversion. - correct some un-intentional float/double promotions.
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/drawgpencil.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 276f60bdf7f..a0a815befba 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -516,7 +516,8 @@ static void gp_draw_strokes (bGPDframe *gpf, int offsx, int offsy, int winx, int
/* draw grease-pencil datablock */
static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy, int cfra, int dflag)
{
- bGPDlayer *gpl, *actlay=NULL;
+ bGPDlayer *gpl;
+ // bGPDlayer *actlay=NULL; // UNUSED
/* reset line drawing style (in case previous user didn't reset) */
setlinestyle(0);
@@ -541,8 +542,8 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy
continue;
/* if layer is active one, store pointer to it */
- if (gpl->flag & GP_LAYER_ACTIVE)
- actlay= gpl;
+ // if (gpl->flag & GP_LAYER_ACTIVE)
+ // actlay= gpl;
/* get frame to draw */
gpf= gpencil_layer_getframe(gpl, cfra, 0);