Merge branch 'master' into blender2.8

2018-11-20 10:46:36 +01:00 · 2018-11-20 10:46:36 +01:00 · 789a259d71
commit 789a259d71
parent f8f5751dac 9bc2570e2a
1 changed files with 0 additions and 4 deletions
--- 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);
 }