Merge branch 'main' into blender-v3.1-release

AsoboStudio · Apr 4, 2022 · 5634ef2 · 5634ef2
2 parents 4e6b970 + 2cadb5a
commit 5634ef2
Show file tree

Hide file tree

Showing 6 changed files with 287 additions and 221 deletions.
diff --git a/addons/io_scene_gltf2_msfs/__init__.py b/addons/io_scene_gltf2_msfs/__init__.py
@@ -25,7 +25,7 @@
  "author": "Luca Pierabella, Wing42, pepperoni505, ronh991, tml1024, and others",
  "description": "This toolkit prepares your 3D assets to be used for Microsoft Flight Simulator",
  "blender": (3, 1, 0),
- "version": (1, 1, 3),
+ "version": (1, 1, 4),
  "location": "File > Import-Export",
  "category": "Import-Export",
  "tracker_url": "https://github.com/AsoboStudio/glTF-Blender-IO-MSFS"

diff --git a/addons/io_scene_gltf2_msfs/blender/msfs_material_function.py b/addons/io_scene_gltf2_msfs/blender/msfs_material_function.py
@@ -719,13 +719,17 @@ def updateColorLinks(self):
 
  def setCompTex(self, tex):
  self.nodeCompTex = self.getNode(MSFS_ShaderNodes.compTex.value)
- self.nodeCompTex.image = tex
- self.updateCompLinks()
+ if tex is not None:
+ self.nodeCompTex.image = tex
+ self.nodeCompTex.image.colorspace_settings.name = "Non-Color"
+ self.updateCompLinks()
 
  def setDetailCompTex(self, tex):
  self.nodeDetailCompTex = self.getNode(MSFS_ShaderNodes.detailCompTex.value)
- self.nodeDetailCompTex.image = tex
- self.updateCompLinks()
+ if tex is not None:
+ self.nodeDetailCompTex.image = tex
+ self.nodeDetailCompTex.image.colorspace_settings.name = "Non-Color"
+ self.updateCompLinks()
 
  def setRoughnessScale(self, scale):
  self.nodeRoughnessScale = self.getNode(MSFS_ShaderNodes.roughnessScale.value)
@@ -746,15 +750,17 @@ def setNormalScale(self, scale):
 
  def setDetailNormalTex(self, tex):
  self.nodeDetailNormalTex = self.getNode(MSFS_ShaderNodes.detailNormalTex.value)
- self.nodeDetailNormalTex.image = tex
- self.nodeDetailNormalTex.image.colorspace_settings.name = "Non-Color"
- self.updateNormalLinks()
+ if tex is not None:
+ self.nodeDetailNormalTex.image = tex
+ self.nodeDetailNormalTex.image.colorspace_settings.name = "Non-Color"
+ self.updateNormalLinks()
 
  def setNormalTex(self, tex):
  self.nodeNormalTex = self.getNode(MSFS_ShaderNodes.normalTex.value)
- self.nodeNormalTex.image = tex
- self.nodeNormalTex.image.colorspace_settings.name = "Non-Color"
- self.updateNormalLinks()
+ if tex is not None:
+ self.nodeNormalTex.image = tex
+ self.nodeNormalTex.image.colorspace_settings.name = "Non-Color"
+ self.updateNormalLinks()
 
  def updateNormalLinks(self):
  self.nodeNormalTex = self.getNode(MSFS_ShaderNodes.normalTex.value)