Merge branch 'master' into blender2.8

1 files changed, 6 insertions, 11 deletions

diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 0d7e05edb2d..54e1512c953 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -675,8 +675,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 					}
 #undef SEQ_USE_PROXY_CUSTOM_DIR
 #undef SEQ_USE_PROXY_CUSTOM_FILE
-				}
-				SEQ_END
+				} SEQ_END;
 			}
 		}
 
@@ -1389,8 +1388,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 			SEQ_BEGIN(sce->ed, seq)
 			{
 				seq->volume = 1.0f;
-			}
-			SEQ_END
+			} SEQ_END;
 		}
 
 		/* particle brush strength factor was changed from int to float */
@@ -1653,8 +1651,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 					if (seq->sat == 0.0f) {
 						seq->sat = 1.0f;
 					}
-				}
-				SEQ_END
+				} SEQ_END;
 			}
 		}
 
@@ -2107,8 +2104,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 				SEQ_BEGIN(scene->ed, seq)
 				{
 					seq->pitch = 1.0f;
-				}
-				SEQ_END
+				} SEQ_END;
 			}
 		}
 
@@ -2183,7 +2179,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 	if (bmain->versionfile < 259 || (bmain->versionfile == 259 && bmain->subversionfile < 2)) {
 		{
 			/* Convert default socket values from bNodeStack */
-			FOREACH_NODETREE(bmain, ntree, id) {
+			FOREACH_NODETREE_BEGIN(bmain, ntree, id) {
 				bNode *node;
 				bNodeSocket *sock;
 
@@ -2200,8 +2196,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 					do_versions_socket_default_value_259(sock);
 
 				ntree->update |= NTREE_UPDATE;
-			}
-			FOREACH_NODETREE_END
+			} FOREACH_NODETREE_END;
 		}
 
 		{