[Bf-extensions-cvs] [d96b6d38] master: BlenderKit: get rid of other styles that aren't supported on the server.

Vilém Duha noreply at git.blender.org
Mon Aug 12 21:29:18 CEST 2019


Commit: d96b6d38d28fa2ec3d2ba4d186d9e0a105e83d18
Author: Vilém Duha
Date:   Mon Aug 12 21:27:58 2019 +0200
Branches: master
https://developer.blender.org/rBAd96b6d38d28fa2ec3d2ba4d186d9e0a105e83d18

BlenderKit: get rid of other styles that aren't supported on the server.

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

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

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

diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 27754e82..45c6b84c 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -108,8 +108,8 @@ model_styles = (
     ('PAINTERLY', 'Painterly', 'hand painted with visible strokes, mostly for games'),
     ('LOWPOLY', 'Lowpoly', "Lowpoly art -don't mix up with polycount!"),
     ('ANIME', 'Anime', 'Anime style'),
-    ('2D VECTOR', '2d Vector', '2d vector'),
-    ('3D GRAPHICS', '3d Graphics', '3d graphics'),
+    ('2D_VECTOR', '2d Vector', '2d vector'),
+    ('3D_GRAPHICS', '3d Graphics', '3d graphics'),
     ('OTHER', 'Other', 'Other style'),
 )
 search_model_styles = (
@@ -117,8 +117,8 @@ search_model_styles = (
     ('PAINTERLY', 'Painterly', 'hand painted with visible strokes, mostly for games'),
     ('LOWPOLY', 'Lowpoly', "Lowpoly art -don't mix up with polycount!"),
     ('ANIME', 'Anime', 'Anime style'),
-    ('2D VECTOR', '2d Vector', '2d vector'),
-    ('3D GRAPHICS', '3d Graphics', '3d graphics'),
+    ('2D_VECTOR', '2d Vector', '2d vector'),
+    ('3D_GRAPHICS', '3d Graphics', '3d graphics'),
     ('OTHER', 'Other', 'Other Style'),
     ('ANY', 'Any', 'Any Style'),
 )
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index d2d3e027..9175bed4 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -452,8 +452,8 @@ def draw_panel_material_upload(self, context):
     prop_needed(layout, props, 'name', props.name)
     layout.prop(props, 'description')
     layout.prop(props, 'style')
-    if props.style == 'OTHER':
-        layout.prop(props, 'style_other')
+    # if props.style == 'OTHER':
+    #     layout.prop(props, 'style_other')
     # layout.prop(props, 'engine')
     # if props.engine == 'OTHER':
     #     layout.prop(props, 'engine_other')
diff --git a/blenderkit/upload.py b/blenderkit/upload.py
index e8183684..6f2fad45 100644
--- a/blenderkit/upload.py
+++ b/blenderkit/upload.py
@@ -217,8 +217,8 @@ def get_upload_data(self, context, asset_type):
             engines.append(props.engine_other.lower())
 
         style = props.style.lower()
-        if style == 'OTHER':
-            style = props.style_other.lower()
+        # if style == 'OTHER':
+        #     style = props.style_other.lower()
 
         pl_dict = {'FINISHED': 'finished', 'TEMPLATE': 'template'}
 
@@ -301,8 +301,8 @@ def get_upload_data(self, context, asset_type):
             engines.append(props.engine_other.lower())
 
         style = props.style.lower()
-        if style == 'OTHER':
-            style = props.style_other.lower()
+        # if style == 'OTHER':
+        #     style = props.style_other.lower()
 
         pl_dict = {'FINISHED': 'finished', 'TEMPLATE': 'template'}
 
@@ -363,8 +363,8 @@ def get_upload_data(self, context, asset_type):
             engine = props.engine_other
         engine = engine.lower()
         style = props.style.lower()
-        if style == 'OTHER':
-            style = props.style_other.lower()
+        # if style == 'OTHER':
+        #     style = props.style_other.lower()
 
         upload_data = {
             "assetType": 'material',
@@ -421,8 +421,8 @@ def get_upload_data(self, context, asset_type):
 
     elif asset_type == 'TEXTURE':
         style = props.style
-        if style == 'OTHER':
-            style = props.style_other
+        # if style == 'OTHER':
+        #     style = props.style_other
 
         upload_data = {
             "assetType": 'texture',



More information about the Bf-extensions-cvs mailing list