diff options
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 67 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 6 |
3 files changed, 41 insertions, 42 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index be1d300fcdb..3744e50db34 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -127,7 +127,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac) } /* Get data being edited in Action Editor (depending on current 'mode') */ -static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) +static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction) { /* get dopesheet */ ac->ads = &saction->ads; @@ -136,7 +136,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) switch (saction->mode) { case SACTCONT_ACTION: /* 'Action Editor' */ /* if not pinned, sync with active object */ - if (/*saction->pin == 0*/ 1) { + if (/*saction->pin == 0*/ true) { if (ac->obact && ac->obact->adt) saction->action = ac->obact->adt->action; else @@ -147,14 +147,14 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) ac->data = saction->action; ac->mode = saction->mode; - return 1; + return true; case SACTCONT_SHAPEKEY: /* 'ShapeKey Editor' */ ac->datatype = ANIMCONT_SHAPEKEY; ac->data = actedit_get_shapekeys(ac); /* if not pinned, sync with active object */ - if (/*saction->pin == 0*/ 1) { + if (/*saction->pin == 0*/ true) { Key *key = (Key *)ac->data; if (key && key->adt) @@ -164,7 +164,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) } ac->mode = saction->mode; - return 1; + return true; case SACTCONT_GPENCIL: /* Grease Pencil */ /* XXX review how this mode is handled... */ /* update scene-pointer (no need to check for pinning yet, as not implemented) */ @@ -174,7 +174,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) ac->data = &saction->ads; ac->mode = saction->mode; - return 1; + return true; case SACTCONT_MASK: /* Mask */ /* XXX review how this mode is handled... */ { @@ -190,7 +190,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) ac->data = &saction->ads; ac->mode = saction->mode; - return 1; + return true; } case SACTCONT_DOPESHEET: /* DopeSheet */ /* update scene-pointer (no need to check for pinning yet, as not implemented) */ @@ -200,21 +200,21 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) ac->data = &saction->ads; ac->mode = saction->mode; - return 1; + return true; default: /* unhandled yet */ ac->datatype = ANIMCONT_NONE; ac->data = NULL; ac->mode = -1; - return 0; + return false; } } /* ----------- Private Stuff - Graph Editor ------------- */ /* Get data being edited in Graph Editor (depending on current 'mode') */ -static short graphedit_get_context(bAnimContext *ac, SpaceIpo *sipo) +static bool graphedit_get_context(bAnimContext *ac, SpaceIpo *sipo) { /* init dopesheet data if non-existant (i.e. for old files) */ if (sipo->ads == NULL) { @@ -240,7 +240,7 @@ static short graphedit_get_context(bAnimContext *ac, SpaceIpo *sipo) ac->data = sipo->ads; ac->mode = sipo->mode; - return 1; + return true; case SIPO_MODE_DRIVERS: /* Driver F-Curve Editor */ /* update scene-pointer (no need to check for pinning yet, as not implemented) */ @@ -251,21 +251,21 @@ static short graphedit_get_context(bAnimContext *ac, SpaceIpo *sipo) ac->data = sipo->ads; ac->mode = sipo->mode; - return 1; + return true; default: /* unhandled yet */ ac->datatype = ANIMCONT_NONE; ac->data = NULL; ac->mode = -1; - return 0; + return false; } } /* ----------- Private Stuff - NLA Editor ------------- */ /* Get data being edited in Graph Editor (depending on current 'mode') */ -static short nlaedit_get_context(bAnimContext *ac, SpaceNla *snla) +static bool nlaedit_get_context(bAnimContext *ac, SpaceNla *snla) { /* init dopesheet data if non-existant (i.e. for old files) */ if (snla->ads == NULL) @@ -280,7 +280,7 @@ static short nlaedit_get_context(bAnimContext *ac, SpaceNla *snla) ac->datatype = ANIMCONT_NLA; ac->data = snla->ads; - return 1; + return true; } /* ----------- Public API --------------- */ @@ -289,10 +289,10 @@ static short nlaedit_get_context(bAnimContext *ac, SpaceNla *snla) * - AnimContext to write to is provided as pointer to var on stack so that we don't have * allocation/freeing costs (which are not that avoidable with channels). */ -short ANIM_animdata_context_getdata(bAnimContext *ac) +bool ANIM_animdata_context_getdata(bAnimContext *ac) { SpaceLink *sl = ac->sl; - short ok = FALSE; + bool ok = false; /* context depends on editor we are currently in */ if (sl) { @@ -327,7 +327,7 @@ short ANIM_animdata_context_getdata(bAnimContext *ac) * allocation/freeing costs (which are not that avoidable with channels). * - Clears data and sets the information from Blender Context which is useful */ -short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) +bool ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) { ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); @@ -335,7 +335,7 @@ short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) Scene *scene = CTX_data_scene(C); /* clear old context info */ - if (ac == NULL) return 0; + if (ac == NULL) return false; memset(ac, 0, sizeof(bAnimContext)); /* get useful default context settings from context */ @@ -869,7 +869,7 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne /* 'Only Selected' selected data and/or 'Include Hidden' filtering * NOTE: when this function returns true, the F-Curve is to be skipped */ -static short skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_id, int filter_mode) +static bool skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_id, int filter_mode) { /* hidden items should be skipped if we only care about visible data, but we aren't interested in hidden stuff */ short skip_hidden = (filter_mode & ANIMFILTER_DATA_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN); @@ -895,16 +895,16 @@ static short skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_i /* skipping - not visible on currently visible layers */ if ((arm->layer & pchan->bone->layer) == 0) - return 1; + return true; /* skipping - is currently hidden */ if (pchan->bone->flag & BONE_HIDDEN_P) - return 1; + return true; } /* can only add this F-Curve if it is selected */ if (ads->filterflag & ADS_FILTER_ONLYSEL) { if ((pchan->bone->flag & BONE_SELECTED) == 0) - return 1; + return true; } } } @@ -928,7 +928,7 @@ static short skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_i /* can only add this F-Curve if it is selected */ if (ads->filterflag & ADS_FILTER_ONLYSEL) { if ((seq == NULL) || (seq->flag & SELECT) == 0) - return 1; + return true; } } } @@ -948,17 +948,18 @@ static short skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_i /* can only add this F-Curve if it is selected */ if (ads->filterflag & ADS_FILTER_ONLYSEL) { if ((node) && (node->flag & NODE_SELECT) == 0) - return 1; + return true; } } } - return 0; + + return false; } /* (Display-)Name-based F-Curve filtering * NOTE: when this function returns true, the F-Curve is to be skipped */ -static short skip_fcurve_with_name(bDopeSheet *ads, FCurve *fcu, ID *owner_id) +static bool skip_fcurve_with_name(bDopeSheet *ads, FCurve *fcu, ID *owner_id) { bAnimListElem ale_dummy = {NULL}; bAnimChannelType *acf; @@ -983,7 +984,7 @@ static short skip_fcurve_with_name(bDopeSheet *ads, FCurve *fcu, ID *owner_id) } /* just let this go... */ - return 1; + return true; } /* Check if F-Curve has errors and/or is disabled @@ -1543,9 +1544,9 @@ static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data, { bNode *node; size_t items = 0; - + items += animdata_filter_ds_nodetree_group(ac, anim_data, ads, owner_id, ntree, filter_mode); - + for (node = ntree->nodes.first; node; node = node->next) { if (node->type == NODE_GROUP) { if (node->id) { @@ -1574,9 +1575,8 @@ static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data } } } - + for (srl = sce->r.layers.first; srl; srl = srl->next) { - /* skip render layers without Freestyle enabled */ if (!(srl->layflag & SCE_LAY_FRS)) continue; @@ -1701,7 +1701,7 @@ static size_t animdata_filter_ds_textures(bAnimContext *ac, ListBase *anim_data, { /* invalid/unsupported option */ if (G.debug & G_DEBUG) - printf("ERROR: unsupported owner_id (i.e. texture stack) for filter textures - %s\n", owner_id->name); + printf("ERROR: Unsupported owner_id (i.e. texture stack) for filter textures - %s\n", owner_id->name); return 0; } } @@ -2620,7 +2620,6 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo /* only filter data if there's somewhere to put it */ if (data && anim_data) { - /* firstly filter the data */ switch (datatype) { /* Action-Editing Modes */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 462e0b527fe..d808c91d4e7 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -234,31 +234,31 @@ static void gp_get_3d_reference(tGPsdata *p, float vec[3]) /* Stroke Editing ---------------------------- */ /* check if the current mouse position is suitable for adding a new point */ -static short gp_stroke_filtermval(tGPsdata *p, const int mval[2], int pmval[2]) +static bool gp_stroke_filtermval(tGPsdata *p, const int mval[2], int pmval[2]) { int dx = abs(mval[0] - pmval[0]); int dy = abs(mval[1] - pmval[1]); /* if buffer is empty, just let this go through (i.e. so that dots will work) */ if (p->gpd->sbuffer_size == 0) - return 1; + return true; /* check if mouse moved at least certain distance on both axes (best case) * - aims to eliminate some jitter-noise from input when trying to draw straight lines freehand */ else if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX)) - return 1; + return true; /* check if the distance since the last point is significant enough * - prevents points being added too densely * - distance here doesn't use sqrt to prevent slowness... we should still be safe from overflows though */ else if ((dx * dx + dy * dy) > MIN_EUCLIDEAN_PX * MIN_EUCLIDEAN_PX) - return 1; + return true; /* mouse 'didn't move' */ else - return 0; + return false; } /* convert screen-coordinates to buffer-coordinates */ diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index c13d0c45f21..dc3fe66cbea 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -347,13 +347,13 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo /* Obtain current anim-data context from Blender Context info. * Returns whether the operation was successful. */ -short ANIM_animdata_get_context(const struct bContext *C, bAnimContext *ac); +bool ANIM_animdata_get_context(const struct bContext *C, bAnimContext *ac); /* Obtain current anim-data context (from Animation Editor) given * that Blender Context info has already been set. * Returns whether the operation was successful. */ -short ANIM_animdata_context_getdata(bAnimContext *ac); +bool ANIM_animdata_context_getdata(bAnimContext *ac); /* ************************************************ */ /* ANIMATION CHANNELS LIST */ @@ -567,7 +567,7 @@ typedef enum eAnimUnitConv_Flags { ANIM_UNITCONV_NORMALIZE_FREEZE = (1 << 6), } eAnimUnitConv_Flags; -/* Normalizatin flags from Space Graph passing to ANIM_unit_mapping_get_factor */ +/* Normalization flags from Space Graph passing to ANIM_unit_mapping_get_factor */ short ANIM_get_normalization_flags(bAnimContext *ac); /* Get unit conversion factor for given ID + F-Curve */ |