bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Few tiny cleanups in Action Editor code (comments only)

Browse Source
This commit is contained in:
Joshua Leung 2008-10-19 03:41:49 +00:00
parent a71cb63ce6
commit 72e5ede546
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/drawaction.c
View File

@ -1220,7 +1220,6 @@ void drawactionspace(ScrArea *sa, void *spacedata)
{ {
bAction *act = NULL; bAction *act = NULL;
Key *key = NULL; Key *key = NULL;
bGPdata *gpd = NULL;
void *data; void *data;
short datatype; short datatype;
@ -1259,7 +1258,7 @@ void drawactionspace(ScrArea *sa, void *spacedata)
key = data; key = data;
break; break;
case ACTCONT_GPENCIL: case ACTCONT_GPENCIL:
gpd = data; /* currently, 'data' value for grease-pencil is G.curscreen! */
break; break;
} }
@ -1599,7 +1598,7 @@ static void draw_keylist(gla2DDrawInfo *di, ListBase *keys, ListBase *blocks, fl
gla2DDrawTranslatePt(di, ak->cfra, ypos, &sc_x, &sc_y); gla2DDrawTranslatePt(di, ak->cfra, ypos, &sc_x, &sc_y);
/* draw using icons - old way which is slower but more proven */ /* draw using icons - old way which is slower but more proven */
if(ak->sel & SELECT) BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE2, 1.0f); if (ak->sel & SELECT) BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE2, 1.0f);
else BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE3, 1.0f); else BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE3, 1.0f);
/* draw using OpenGL - slightly uglier but faster */ /* draw using OpenGL - slightly uglier but faster */

7
source/blender/src/editaction.c
View File

@ -529,9 +529,10 @@ static void actdata_filter_gpencil (ListBase *act_data, bScreen *sc, int filter_
/* check if filtering types are appropriate */ /* check if filtering types are appropriate */
if ( !(filter_mode & (ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU|ACTFILTER_ACTGROUPED)) ) if ( !(filter_mode & (ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU|ACTFILTER_ACTGROUPED)) )
{ {
/* special hack for fullscreen area (which must be this one then), /* special hack for fullscreen area (which must be this one then):
* so we use the curarea->full as screen to get spaces from, since the * - we use the curarea->full as screen to get spaces from, since the
* old (pre-fullscreen) screen was stored there... * old (pre-fullscreen) screen was stored there...
* - this is needed as all data would otherwise disappear
*/ */
if ((curarea->full) && (curarea->spacetype==SPACE_ACTION)) if ((curarea->full) && (curarea->spacetype==SPACE_ACTION))
sc= curarea->full; sc= curarea->full;