[Bf-blender-cvs] [d812e0cb64] blender2.8: Blender 2.8: Apparently auto-merge worked incorrect in the merge commit
Sergey Sharybin
noreply at git.blender.org
Thu Jan 26 17:04:58 CET 2017
Commit: d812e0cb647deb6a6b5b0c2ead44310e751a1aed
Author: Sergey Sharybin
Date: Thu Jan 26 17:04:25 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBd812e0cb647deb6a6b5b0c2ead44310e751a1aed
Blender 2.8: Apparently auto-merge worked incorrect in the merge commit
===================================================================
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index b0fe5cf93a..477382d8c5 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1572,23 +1572,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
-}
-
-void do_versions_after_linking_270(Main *main)
-{
- /* To be added to next subversion bump! */
- {
- FOREACH_NODETREE(main, ntree, id) {
- if (ntree->type == NTREE_COMPOSIT) {
- ntreeSetTypes(NULL, ntree);
- for (bNode *node = ntree->nodes.first; node; node = node->next) {
- if (node->type == CMP_NODE_HUE_SAT) {
- do_version_hue_sat_node(ntree, node);
- }
- }
- }
- } FOREACH_NODETREE_END
- }
{
if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
@@ -1613,3 +1596,20 @@ void do_versions_after_linking_270(Main *main)
}
}
}
+
+void do_versions_after_linking_270(Main *main)
+{
+ /* To be added to next subversion bump! */
+ {
+ FOREACH_NODETREE(main, ntree, id) {
+ if (ntree->type == NTREE_COMPOSIT) {
+ ntreeSetTypes(NULL, ntree);
+ for (bNode *node = ntree->nodes.first; node; node = node->next) {
+ if (node->type == CMP_NODE_HUE_SAT) {
+ do_version_hue_sat_node(ntree, node);
+ }
+ }
+ }
+ } FOREACH_NODETREE_END
+ }
+}
More information about the Bf-blender-cvs
mailing list