Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-01-27 12:26:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-27 12:26:19 +0300
commit75c426a60af024d4b85537cf2b26a57882282870 (patch)
tree7af22880bd766792e4aa2e84360ed36cd3d054d5 /release
parentfc669a4c3ec0c3ccce7eecc4408636271f3a1fd4 (diff)
parent4b7b4efd5be6c2c06f6f257c07f429aede7ddc0f (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/bpy_extras/node_shader_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/modules/bpy_extras/node_shader_utils.py b/release/scripts/modules/bpy_extras/node_shader_utils.py
index 161560f7f05..54124fd4ca6 100644
--- a/release/scripts/modules/bpy_extras/node_shader_utils.py
+++ b/release/scripts/modules/bpy_extras/node_shader_utils.py
@@ -702,7 +702,7 @@ class ShaderImageTextureWrapper():
image = image.copy()
image.colorspace_settings.is_data = self.colorspace_is_data
if self.colorspace_name is not ...:
- if image.colorspace_settings.is_data != self.colorspace_is_data and image.users >= 1:
+ if image.colorspace_settings.name != self.colorspace_name and image.users >= 1:
image = image.copy()
image.colorspace_settings.name = self.colorspace_name
if self.use_alpha: