[Bf-extensions-cvs] [ad051a06] blender-v2.81-release: BlenderKit: fix ui for material upload. Is free wasn't visible and it wasn't clear to some users that all materials are free.

Vilém Duha noreply at git.blender.org
Sun Nov 10 21:34:39 CET 2019


Commit: ad051a06e341ec074cda5bf15bba01d5d9e49521
Author: Vilém Duha
Date:   Sun Nov 10 20:01:07 2019 +0100
Branches: blender-v2.81-release
https://developer.blender.org/rBAad051a06e341ec074cda5bf15bba01d5d9e49521

BlenderKit: fix ui for material upload.
Is free wasn't visible and it wasn't clear to some users that all materials are free.

===================================================================

M	blenderkit/__init__.py
M	blenderkit/ui_panels.py

===================================================================

diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 5c8c8e5f..1eccfa4d 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -410,7 +410,19 @@ def update_tags(self, context):
     if props.tags != ns:
         props.tags = ns
 
+def update_free(self, context):
+    if self.is_free == False:
+        self.is_free = True
+        title = "All BlenderKit materials are free"
+        message = "Any material uploaded to BlenderKit is free." \
+                  " However, it can still earn money for the author," \
+                  " based on our fair share system. " \
+                  "Part of subscription is sent to artists based on usage by paying users."
 
+        def draw_message(self, context):
+            ui_panels.label_multiline(self.layout, text=message, icon='NONE', width=-1)
+
+        bpy.context.window_manager.popup_menu(draw_message, title=title, icon='INFO')
 
 class BlenderKitCommonUploadProps(object):
     id: StringProperty(
@@ -609,6 +621,10 @@ class BlenderKitMaterialUploadProps(PropertyGroup, BlenderKitCommonUploadProps):
         description="shaders used in asset, autofilled",
         default="",
     )
+    is_free: BoolProperty(name="Free for Everyone",
+                          description="You consent you want to release this asset as free for everyone",
+                          default=True, update=update_free
+                          )
 
     uv: BoolProperty(name="Needs UV", description="needs an UV set", default=False)
     # printable_3d : BoolProperty( name = "3d printable", description = "can be 3d printed", default = False)
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index d7e40714..a31a0392 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -463,6 +463,8 @@ def draw_panel_material_upload(self, context):
     layout.prop(props, 'tags')
     # layout.prop(props,'shaders')#TODO autofill on upload
     # row = layout.row()
+    layout.prop(props, 'is_free')
+
     layout.prop(props, 'pbr')
     layout.prop(props, 'uv')
     layout.prop(props, 'animated')



More information about the Bf-extensions-cvs mailing list