diff options
author | Vilem Duha <vilem.duha@gmail.com> | 2019-05-19 16:14:58 +0300 |
---|---|---|
committer | Vilem Duha <vilem.duha@gmail.com> | 2019-05-19 16:59:48 +0300 |
commit | 7d92fb16c9fc8e4b39c4d63f9da66e3f9e36dbba (patch) | |
tree | 3c3e3a7950cdc2ffe4df504f0791403819c345eb /blenderkit | |
parent | b0027289420fd8eaf7c2686e6a64ffe8b2e4419e (diff) |
BlenderKit: API hotfixes - to_mesh() and Image colourspace settings.
Diffstat (limited to 'blenderkit')
-rw-r--r-- | blenderkit/asset_inspector.py | 6 | ||||
-rw-r--r-- | blenderkit/search.py | 9 | ||||
-rw-r--r-- | blenderkit/ui.py | 2 | ||||
-rw-r--r-- | blenderkit/utils.py | 18 |
4 files changed, 19 insertions, 16 deletions
diff --git a/blenderkit/asset_inspector.py b/blenderkit/asset_inspector.py index 58867d6e..35c4da21 100644 --- a/blenderkit/asset_inspector.py +++ b/blenderkit/asset_inspector.py @@ -206,9 +206,9 @@ def check_meshprops(props, obs): if ob.type == 'MESH' or ob.type == 'CURVE': ob_eval = None if ob.type == 'CURVE': - depsgraph = bpy.context.evaluated_depsgraph_get() - ob_eval = ob.evaluated_get(depsgraph) - mesh = ob_eval.to_mesh() + # depsgraph = bpy.context.evaluated_depsgraph_get() + # object_eval = ob.evaluated_get(depsgraph) + mesh = ob.to_mesh() else: mesh = ob.data fco = len(mesh.polygons) diff --git a/blenderkit/search.py b/blenderkit/search.py index 44bc1005..0a401860 100644 --- a/blenderkit/search.py +++ b/blenderkit/search.py @@ -292,7 +292,7 @@ def load_previews(): img.unpack(method='USE_ORIGINAL') img.filepath = tpath img.reload() - + img.colorspace_settings.name = 'Linear' i += 1 # print('previews loaded') @@ -571,7 +571,7 @@ def write_profile(adata): utils.p('writing profile') user = adata['user'] # we have to convert to MB here, numbers too big for python int type - if user.get('sumAssetFileSize') is not None: + if user.get('sumAssetFilesSize') is not None: user['sumAssetFilesSize'] /= (1024 * 1024) user['sumPrivateAssetFilesSize'] /= (1024 * 1024) user['remainingPrivateQuota'] /= (1024 * 1024) @@ -604,9 +604,8 @@ def fetch_profile(api_key): def get_profile(): preferences = bpy.context.preferences.addons['blenderkit'].preferences a = bpy.context.window_manager.get('bkit profile') - if a is None: - thread = threading.Thread(target=fetch_profile, args=(preferences.api_key,), daemon=True) - thread.start() + thread = threading.Thread(target=fetch_profile, args=(preferences.api_key,), daemon=True) + thread.start() return a diff --git a/blenderkit/ui.py b/blenderkit/ui.py index 8a3a6aa4..2ac3c9e3 100644 --- a/blenderkit/ui.py +++ b/blenderkit/ui.py @@ -724,7 +724,7 @@ def draw_callback_2d_search(self, context): else: iname = utils.previmg_name(ui_props.active_index) img = bpy.data.images.get(iname) - + img.colorspace_settings.name = 'Linear' draw_tooltip(ui_props.mouse_x, ui_props.mouse_y, text=ui_props.tooltip, img=img) if ui_props.dragging and ( diff --git a/blenderkit/utils.py b/blenderkit/utils.py index 1728212a..00ce1b5e 100644 --- a/blenderkit/utils.py +++ b/blenderkit/utils.py @@ -230,6 +230,7 @@ def get_hidden_image(tpath, bdata_name, force_reload=False): if img.packed_file is not None: img.unpack(method='USE_ORIGINAL') img.reload() + img.colorspace_settings.name = 'Linear' return img @@ -239,6 +240,7 @@ def get_thumbnail(name): img = bpy.data.images.get(name) if img == None: img = bpy.data.images.load(p) + img.colorspace_settings.name = 'Linear' img.name = name img.name = name @@ -297,13 +299,14 @@ def get_bounds_snappable(obs, use_modifiers=False): # If to_mesh() works we can use it on curves and any other ob type almost. # disabled to_mesh for 2.8 by now, not wanting to use dependency graph yet. depsgraph = bpy.context.evaluated_depsgraph_get() + object_eval = ob.evaluated_get(depsgraph) - mesh = object_eval.to_mesh() + if ob.type == 'CURVE': + mesh = object_eval.to_mesh() + else: + mesh = object_eval.data - # if self.applyModifiers: - # evaluated_get(depsgraph).to_mesh() - # else: - # to_mesh() + # to_mesh(context.depsgraph, apply_modifiers=self.applyModifiers, calc_undeformed=False) obcount += 1 for c in mesh.vertices: coord = c.co @@ -315,8 +318,9 @@ def get_bounds_snappable(obs, use_modifiers=False): maxx = max(maxx, parent_coord.x) maxy = max(maxy, parent_coord.y) maxz = max(maxz, parent_coord.z) - - object_eval.to_mesh_clear() + # bpy.data.meshes.remove(mesh) + if ob.type == 'CURVE': + object_eval.to_mesh_clear() if obcount == 0: minx, miny, minz, maxx, maxy, maxz = 0, 0, 0, 0, 0, 0 |