Merge branch 'master' into blender2.8

2017-08-28 11:27:50 +02:00
parent 49e7b77b19 2e71927622
commit f9f4e20871
23 changed files with 62 additions and 4 deletions
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -379,6 +379,8 @@ static void seqclipboard_ptr_restore(Main *bmain, ID **id_pt)
 					}
 					break;
 				}
+				default:
+					break;
 			}
 		}