[Bf-blender-cvs] [651b0424ade] soc-2020-info-editor: Join printf with report

[Mateusz Grzeliński]

Commit: 651b0424adeea88dc0a834ac32b4744e42d6cc49
Author: Mateusz Grzeliński
Date:   Wed Jul 1 16:55:45 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB651b0424adeea88dc0a834ac32b4744e42d6cc49

Join printf with report

If this is user oriented message there is no need to print it in console. Report will be persistent in info editor.

===================================================================

M	source/blender/blenloader/intern/versioning_280.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 111ac728cc3..a3d305f8f56 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -21,6 +21,7 @@
 /* allow readfile to use deprecated functionality */
 #define DNA_DEPRECATED_ALLOW
 
+#include <CLG_log.h>
 #include <float.h>
 #include <string.h>
 
@@ -1903,18 +1904,20 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
     FOREACH_NODETREE_END;
 
     if (error & NTREE_DOVERSION_NEED_OUTPUT) {
-      BKE_report(fd->reports, RPT_ERROR, "Eevee material conversion problem. Error in console");
-      printf(
-          "You need to connect Principled and Eevee Specular shader nodes to new material "
-          "output "
-          "nodes.\n");
+      BKE_report(fd->reports,
+                 RPT_ERROR,
+                 "Eevee material conversion problem. \n"
+                 "You need to connect Principled and Eevee Specular shader nodes to new material "
+                 "output nodes");
     }
 
     if (error & NTREE_DOVERSION_TRANSPARENCY_EMISSION) {
-      BKE_report(fd->reports, RPT_ERROR, "Eevee material conversion problem. Error in console");
-      printf(
+      BKE_report(
+          fd->reports,
+          RPT_ERROR,
+          "Eevee material conversion problem. \n"
           "You need to combine transparency and emission shaders to the converted Principled "
-          "shader nodes.\n");
+          "shader nodes.");
     }
 
 #ifdef USE_COLLECTION_COMPAT_28