blender
/
blender-addons
17
33
Fork 92
Code Issues 526 Pull Requests 32 Projects 1 Releases Wiki Activity

Merge branch 'blender-v2.82-release'

This commit is contained in:
Julien Duroure 2020-01-24 16:59:33 +01:00
parent 81ed56cbce 2f20818775
commit 96e3c6f25d
4 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_gltf2/__init__.py
View File

@ -15,7 +15,7 @@
bl_info = {
'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
"version": (1, 2, 6),
"version": (1, 2, 7),
'blender': (2, 81, 6),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',

2
io_scene_gltf2/blender/imp/gltf2_blender_image.py
View File

@ -92,7 +92,7 @@ class BlenderImage():
# Create a temp image, pack, and delete image
tmp_image = tempfile.NamedTemporaryFile(delete=False)
img_data, img_name = BinaryData.get_image_data(gltf, img_idx)
if img_name is not None:
if img_data is not None:
tmp_image.write(img_data)
tmp_image.close()

2
object_collection_manager/__init__.py
View File

@ -22,7 +22,7 @@ bl_info = {
"name": "Collection Manager",
"description": "Manage collections and their objects",
"author": "Ryan Inch",
"version": (1,8,8),
"version": (1,8,9),
"blender": (2, 80, 0),
"location": "View3D - Object Mode (Shortcut - M)",
"warning": '', # used for warning icon and text in addons panel

48
object_collection_manager/operators.py
View File

@ -192,7 +192,7 @@ class CMExcludeOperator(Operator):
# check if collection isolated
if len(active_layer_collections) == 1 and active_layer_collections[0]["name"] == self.name:
if len(exclude_history) > 1:
if len(exclude_history) > 0:
# restore previous state
for x, item in enumerate(layer_collections.values()):
item["ptr"].exclude = exclude_history[x]
@ -212,17 +212,9 @@ class CMExcludeOperator(Operator):
exclude_history.clear()
# save state
keep_history = -1
for item in layer_collections.values():
exclude_history.append(item["ptr"].exclude)
if item["ptr"].exclude == False:
keep_history += 1
if not keep_history:
del rto_history["exclude"][view_layer]
# isolate collection
for item in layer_collections.values():
if item["name"] != laycol_ptr.name:
@ -378,7 +370,7 @@ class CMRestrictSelectOperator(Operator):
# check if reversed layerchain matches active collections
if layerchain[::-1] == active_layer_collections:
if len(select_history) > 1:
if len(select_history) > 0:
# restore previous state
for x, item in enumerate(layer_collections.values()):
item["ptr"].collection.hide_select = select_history[x]
@ -396,16 +388,9 @@ class CMRestrictSelectOperator(Operator):
select_history.clear()
# save state
keep_history = -1
for item in layer_collections.values():
select_history.append(item["ptr"].collection.hide_select)
if item["ptr"].collection.hide_select == False:
keep_history += 1
if not keep_history:
del rto_history["select"][view_layer]
# make all collections unselectable
for item in layer_collections.values():
item["ptr"].collection.hide_select = True
@ -538,7 +523,7 @@ class CMHideOperator(Operator):
# check if reversed layerchain matches active collections
if layerchain[::-1] == active_layer_collections:
if len(hide_history) > 1:
if len(hide_history) > 0:
# restore previous state
for x, item in enumerate(layer_collections.values()):
item["ptr"].hide_viewport = hide_history[x]
@ -556,16 +541,9 @@ class CMHideOperator(Operator):
hide_history.clear()
# save state
keep_history = -1
for item in layer_collections.values():
hide_history.append(item["ptr"].hide_viewport)
if item["ptr"].hide_viewport == False:
keep_history += 1
if not keep_history:
del rto_history["hide"][view_layer]
# hide all collections
for laycol in layer_collections.values():
laycol["ptr"].hide_viewport = True
@ -697,7 +675,7 @@ class CMDisableViewportOperator(Operator):
# check if reversed layerchain matches active collections
if layerchain[::-1] == active_layer_collections:
if len(disable_history) > 1:
if len(disable_history) > 0:
# restore previous state
for x, item in enumerate(layer_collections.values()):
item["ptr"].collection.hide_viewport = disable_history[x]
@ -715,16 +693,9 @@ class CMDisableViewportOperator(Operator):
disable_history.clear()
# save state
keep_history = -1
for item in layer_collections.values():
disable_history.append(item["ptr"].collection.hide_viewport)
if item["ptr"].collection.hide_viewport == False:
keep_history += 1
if not keep_history:
del rto_history["disable"][view_layer]
# disable all collections in viewport
for laycol in layer_collections.values():
laycol["ptr"].collection.hide_viewport = True
@ -821,7 +792,7 @@ class CMUnDisableViewportAllOperator(Operator):
class CMDisableRenderOperator(Operator):
''' * Shift-Click to isolate/restore previous state\n * Shift-Click to invert viewport display of all collections'''
''' * Shift-Click to isolate/restore previous state\n * Ctrl-Click to toggle children'''
bl_label = "Disable Collection in Render"
bl_idname = "view3d.disable_render_collection"
bl_options = {'REGISTER', 'UNDO'}
@ -857,7 +828,7 @@ class CMDisableRenderOperator(Operator):
# check if reversed layerchain matches active collections
if layerchain[::-1] == active_layer_collections:
if len(render_history) > 1:
if len(render_history) > 0:
# restore previous state
for x, item in enumerate(layer_collections.values()):
item["ptr"].collection.hide_render = render_history[x]
@ -875,16 +846,9 @@ class CMDisableRenderOperator(Operator):
render_history.clear()
# save state
keep_history = -1
for item in layer_collections.values():
render_history.append(item["ptr"].collection.hide_render)
if item["ptr"].collection.hide_render == False:
keep_history += 1
if not keep_history:
del rto_history["render"][view_layer]
# disallow render of all collections
for laycol in layer_collections.values():
laycol["ptr"].collection.hide_render = True