kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixed crash when trying to perform transformation in Clip Editor without clip opened

Browse Source 
Reported by JumboCoDeC in IRC. Thanks for the report.
This commit is contained in:
Sergey Sharybin 2012-06-25 19:48:05 +00:00
parent 4da7b7089d
commit 01dea9ff85
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_clip/clip_editor.c
View File

@ -177,6 +177,13 @@ void ED_space_clip_get_aspect_dimension_aware(SpaceClip *sc, float *aspx, float
* mainly this is sued for transformation stuff * mainly this is sued for transformation stuff
*/ */
if (!sc->clip) {
*aspx = 1.0f;
*aspy = 1.0f;
return;
}
ED_space_clip_get_aspect(sc, aspx, aspy); ED_space_clip_get_aspect(sc, aspx, aspy);
BKE_movieclip_get_size(sc->clip, &sc->user, &w, &h); BKE_movieclip_get_size(sc->clip, &sc->user, &w, &h);

5
source/blender/editors/transform/transform_conversions.c
View File

@ -5913,9 +5913,12 @@ static void createTransTrackingData(bContext *C, TransInfo *t)
t->total = 0; t->total = 0;
if (!clip)
return;
BKE_movieclip_get_size(clip, &sc->user, &width, &height); BKE_movieclip_get_size(clip, &sc->user, &width, &height);
if (!clip || width == 0 || height == 0) if (width == 0 || height == 0)
return; return;
if (ar->regiontype == RGN_TYPE_PREVIEW) { if (ar->regiontype == RGN_TYPE_PREVIEW) {