[Bf-blender-cvs] [f2144cf298a] master: Fix T64651, T64658: image texture not set to non-color properly

[Brecht Van Lommel]

Commit: f2144cf298aab7fd173025e490fa9e98b7661a88
Author: Brecht Van Lommel
Date:   Thu May 16 05:17:22 2019 +0200
Branches: master
https://developer.blender.org/rBf2144cf298aab7fd173025e490fa9e98b7661a88

Fix T64651, T64658: image texture not set to non-color properly

The version check was wrong, only working for older files.

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

M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenloader/intern/versioning_cycles.c

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index ccf760d891e..1ca63eacec3 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -27,7 +27,7 @@
  * \note Use #STRINGIFY() rather than defining with quotes.
  */
 #define BLENDER_VERSION 280
-#define BLENDER_SUBVERSION 65
+#define BLENDER_SUBVERSION 66
 /** Several breakages with 280, e.g. collections vs layers. */
 #define BLENDER_MINVERSION 280
 #define BLENDER_MINSUBVERSION 0
diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c
index 7616e62af9f..ace90350a21 100644
--- a/source/blender/blenloader/intern/versioning_cycles.c
+++ b/source/blender/blenloader/intern/versioning_cycles.c
@@ -400,7 +400,7 @@ void blo_do_versions_cycles(FileData *UNUSED(fd), Library *UNUSED(lib), Main *bm
 
 void do_versions_after_linking_cycles(Main *bmain)
 {
-  if (!MAIN_VERSION_ATLEAST(bmain, 280, 5)) {
+  if (!MAIN_VERSION_ATLEAST(bmain, 280, 66)) {
     /* Shader node tree changes. After lib linking so we have all the typeinfo
      * pointers and updated sockets and we can use the high level node API to
      * manipulate nodes. */
@@ -443,7 +443,7 @@ void do_versions_after_linking_cycles(Main *bmain)
         ambient_occlusion_node_relink(ntree);
       }
 
-      if (!MAIN_VERSION_ATLEAST(bmain, 280, 63)) {
+      if (!MAIN_VERSION_ATLEAST(bmain, 280, 66)) {
         for (bNode *node = ntree->nodes.first; node; node = node->next) {
           image_node_colorspace(node);
         }