ok, I committed this because it looks like it could lead to a crash, but feel free to overwrite the change when you merge.
On Mon, Apr 30, 2012 at 9:40 PM, Sergey Sharybin <[email protected]> wrote: > Eeeek.. Can you please wait a bit with cleaning space clip and motion > tracking modules cleanup for a while? Trying to finish latest preparation > for merge of some features from tomato and such a cleanup leads to annoying > merge conflicts :S > > On Mon, Apr 30, 2012 at 5:08 PM, Campbell Barton <[email protected]>wrote: > >> Revision: 46108 >> >> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46108 >> Author: campbellbarton >> Date: 2012-04-30 11:08:53 +0000 (Mon, 30 Apr 2012) >> Log Message: >> ----------- >> code cleanup: clang warning - use of a pointer before checking its NULL. >> >> Modified Paths: >> -------------- >> trunk/blender/source/blender/editors/space_clip/space_clip.c >> >> Modified: trunk/blender/source/blender/editors/space_clip/space_clip.c >> =================================================================== >> --- trunk/blender/source/blender/editors/space_clip/space_clip.c >> 2012-04-30 10:47:32 UTC (rev 46107) >> +++ trunk/blender/source/blender/editors/space_clip/space_clip.c >> 2012-04-30 11:08:53 UTC (rev 46108) >> @@ -779,11 +779,12 @@ >> } >> else { >> /* store graph region align */ >> - if (ar_preview->alignment == RGN_ALIGN_TOP) >> - sc->runtime_flag &= ~SC_GRAPH_BOTTOM; >> - else if (ar_preview->alignment == RGN_ALIGN_BOTTOM) >> - sc->runtime_flag |= SC_GRAPH_BOTTOM; >> - >> + if (ar_preview) { >> + if (ar_preview->alignment == RGN_ALIGN_TOP) >> + sc->runtime_flag &= ~SC_GRAPH_BOTTOM; >> + else if (ar_preview->alignment == RGN_ALIGN_BOTTOM) >> + sc->runtime_flag |= SC_GRAPH_BOTTOM; >> + } >> if (ar_preview && !(ar_preview->flag & RGN_FLAG_HIDDEN)) { >> ar_preview->flag |= RGN_FLAG_HIDDEN; >> ar_preview->v2d.flag &= ~V2D_IS_INITIALISED; >> >> _______________________________________________ >> Bf-blender-cvs mailing list >> [email protected] >> http://lists.blender.org/mailman/listinfo/bf-blender-cvs >> > > > > -- > With best regards, Sergey Sharybin > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers -- - Campbell _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
