diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
| commit | 1b4a54ad73c058baa59ffdc9e5f18b0b79030fb0 (patch) | |
| tree | a5b84d392ea14b0d760a5e24f7a8e51f203d558c /source/blender/editors/transform/transform_conversions.c | |
| parent | edec46b0a6aac18f406991b9e16228d4bd848c61 (diff) | |
| parent | bc5ec4e69cf3308c2563239c0e8372b853800a78 (diff) | |
Merge with trunk r41701soc-2011-carrot
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0a6f49f7c9f..7ab1b24e9b3 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5396,7 +5396,7 @@ static void createTransTrackingData(bContext *C, TransInfo *t) TransDataTracking *tdt; int framenr = sc->user.framenr; - if(clip && !BKE_movieclip_has_frame(clip, &sc->user)) { + if(!clip || !BKE_movieclip_has_frame(clip, &sc->user)) { t->total = 0; return; } |