Skip to content

Commit

Permalink
Merge branch 'Release' into Development
Browse files Browse the repository at this point in the history
  • Loading branch information
pragma37 committed Nov 26, 2022
2 parents 31426b8 + d119ae0 commit cff10fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion BlenderMalt/MaltProperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,10 @@ def get_parameter(self, key, overrides, proxys, retrieve_blender_type=False, rna
if texture:
texture_key = ('texture', texture.name_full)
if texture_key not in proxys.keys():
proxys[texture_key] = MaltTextures.get_texture(texture)
if proxy := MaltTextures.get_texture(texture):
proxys[texture_key] = proxy
else:
return None
return proxys[texture_key]
else:
return None
Expand Down
2 changes: 1 addition & 1 deletion BlenderMalt/MaltTextures.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def __load_texture(texture):
size = w*h*channels
sRGB = texture.colorspace_settings.name == 'sRGB' and texture.is_float == False
if size == 0:
return True
return False

buffer = MaltPipeline.get_bridge().get_shared_buffer(ctypes.c_float, size)
texture.pixels.foreach_get(buffer.as_np_array())
Expand Down

0 comments on commit cff10fc

Please sign in to comment.