diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-20 18:48:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-20 18:48:01 +0300 |
| commit | 06aee2ef0e1c810c24b2559838e46045d708b22f (patch) | |
| tree | 795408b02937d52440bfcd6fc1aa7a4da8f431d1 /source/blender/makesrna/intern/rna_nla.c | |
| parent | 8c4e95da48b3b896f012d7a1b7c89841270c40c6 (diff) | |
misc warnings/fixes
- WITH_OPENJPEG wasn't defined for creator.c with CMake.
- remove shadowed/redefined vars.
- remove some unused RNA report args.
- re-arrange IMB_FILE_TYPES so IRIS is not the first format tested, since its not very common test JPEG and PNG first.
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index f28fec75fe2..c2d38aaf038 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -317,9 +317,14 @@ static NlaStrip *rna_NlaStrip_new(NlaTrack *track, bContext *C, ReportList *repo static void rna_NlaStrip_remove(NlaTrack *track, bContext *C, ReportList *reports, NlaStrip *strip) { - free_nlastrip(&track->strips, strip); - - WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_REMOVED, NULL); + if(BLI_findindex(&track->strips, strip) == -1) { + BKE_reportf(reports, RPT_ERROR, "NLA's Strip '%s' not found in track '%s'", strip->name, track->name); + return; + } + else { + free_nlastrip(&track->strips, strip); + WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_REMOVED, NULL); + } } #else |