blender
/
blender-addons
17
34
Fork 94
Code Issues 530 Pull Requests 32 Projects 1 Releases Wiki Activity

Merge branch 'blender-v2.90-release' 

# Conflicts:
#	object_collection_manager/__init__.py
This commit is contained in:
Vilém Duha 2020-08-23 10:42:00 +02:00
parent 6ba9c816f3 97be901f07
commit 91b8f51c8c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blenderkit/ratings.py
View File

@ -289,8 +289,10 @@ def update_ratings_work_hours_ui_1_5(self, context):
# return
bpy.ops.wm.blenderkit_login('INVOKE_DEFAULT',
message='Please login/signup to rate assets. Clicking OK takes you to web login.')
self.update_ratings_work_hours_ui_1_5 = '0'
self.rating_work_hours = float(self.update_ratings_work_hours_ui_1_5)
self.rating_work_hours_ui_1_5 = '0'
# print('updating 1-5')
# print(float(self.rating_work_hours_ui_1_5))
self.rating_work_hours = float(self.rating_work_hours_ui_1_5)

2
blenderkit/upload.py
View File

@ -816,6 +816,8 @@ class AssetVerificationStatusChange(Operator):
def execute(self, context):
preferences = bpy.context.preferences.addons['blenderkit'].preferences
if not bpy.context.scene['search results']:
return;
# update status in search results for validator's clarity
sr = bpy.context.scene['search results']
sro = bpy.context.scene['search results orig']['results']