projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender-staging.git]
/
source
/
blender
/
editors
/
transform
/
transform_conversions.c
diff --git
a/source/blender/editors/transform/transform_conversions.c
b/source/blender/editors/transform/transform_conversions.c
index b104c5bb513d7dcf997fe0db1e014fb9d2654326..5b2e83cbfbd5cd8edadab2bdf6a5dfd0def65159 100644
(file)
--- a/
source/blender/editors/transform/transform_conversions.c
+++ b/
source/blender/editors/transform/transform_conversions.c
@@
-5533,7
+5533,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;
}