diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-11-20 12:46:36 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-11-20 12:46:36 +0300 |
| commit | 789a259d71745b0f99e511add36b09ea69883ef5 (patch) | |
| tree | 2533d23925bf9c14df29dd9a00bc59cf724630bc /source/blender/makesrna/intern/rna_movieclip.c | |
| parent | f8f5751dac6ea2d5f1c8ee9bb6ef247cad5d6119 (diff) | |
| parent | 9bc2570e2ac7e3fc5e6095af300ef863d3ba4ca6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_movieclip.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_movieclip.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index ad97eecc100..db93518a6c7 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -75,10 +75,6 @@ static void rna_MovieClip_size_get(PointerRNA *ptr, int *values) static float rna_MovieClip_fps_get(PointerRNA *ptr) { MovieClip *clip = (MovieClip *)ptr->id.data; - if (clip == NULL) { - return 0.0f; - } - return BKE_movieclip_get_fps(clip); } |