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

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'blenderkit/utils.py')
-rw-r--r--blenderkit/utils.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/blenderkit/utils.py b/blenderkit/utils.py
index 7abc07d5..953ded5e 100644
--- a/blenderkit/utils.py
+++ b/blenderkit/utils.py
@@ -326,14 +326,14 @@ def uploadable_asset_poll():
return True
-def get_hidden_texture(img, force_reload=False):
- # i = get_hidden_image(tpath, bdata_name, force_reload=force_reload)
- # bdata_name = f".{bdata_name}"
- t = bpy.data.textures.get(img.name)
+def get_hidden_texture(name, force_reload=False):
+ t = bpy.data.textures.get(name)
if t is None:
- t = bpy.data.textures.new(img.name, 'IMAGE')
- if t.image != img:
- t.image = img
+ t = bpy.data.textures.new(name, 'IMAGE')
+ if not t.image or t.image.name != name:
+ img = bpy.data.images.get(name)
+ if img:
+ t.image = img
return t
@@ -691,15 +691,15 @@ def name_update(props):
asset.name = fname
-def get_param(asset_data, parameter_name):
+def get_param(asset_data, parameter_name, default = None):
if not asset_data.get('parameters'):
# this can appear in older version files.
- return None
+ return default
for p in asset_data['parameters']:
if p.get('parameterType') == parameter_name:
return p['value']
- return None
+ return default
def params_to_dict(params):