griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
The version check was wrong, only working for older files.
This commit is contained in:
Brecht Van Lommel
2019-05-16 05:17:22 +02:00
parent 4a766732e6
commit f2144cf298
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -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

4
source/blender/blenloader/intern/versioning_cycles.c
View File

@@ -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);
}