Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-01-06 13:47:23 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-01-06 14:41:15 +0300
commit7f3e121926fdd985d37ce8371647d79e09e37917 (patch)
tree19a074bc4bd0ba33dd8a1afaaf2004c7f31a4df7 /release
parenta6d01365e3bb2e11f1028d92f01c180b6a5ccb35 (diff)
USD Exporter: removed from experimental features
There were two reasons the USD Exporter was listed as experimental: - Originally there was no deduplication of mesh normals & UV coordinates (resolved in rBf5e00f735106b5ec635806a4c795a2bc46ae8369), and - the way materials were exported was incompatible with instancing with USD 19.07. This seems to be resolved with the current version of USD (19.11). Blender (more specifically, `makesdna`) doesn't seem to like empty DNA structs, so I couldn't remove all properties from `UserDef_Experimental`. Instead I have just kept `char _pad0[8]`. Reviewed by: campbellbarton Differential Revision: https://developer.blender.org/D6519
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py2
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py26
2 files changed, 1 insertions, 27 deletions
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 7dbf49d01e3..fd46bd53cd2 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -471,7 +471,7 @@ class TOPBAR_MT_file_export(Menu):
text="Collada (Default) (.dae)")
if bpy.app.build_options.alembic:
self.layout.operator("wm.alembic_export", text="Alembic (.abc)")
- if bpy.app.build_options.usd and context.preferences.experimental.use_usd_exporter:
+ if bpy.app.build_options.usd:
self.layout.operator(
"wm.usd_export", text="Universal Scene Description (.usd, .usdc, .usda)")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index b497d688339..4f35bcc29df 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2118,30 +2118,6 @@ class USERPREF_PT_experimental_virtual_reality(ExperimentalPanel, Panel):
"""
-class USERPREF_PT_experimental_usd(ExperimentalPanel, Panel):
- bl_label = "Universal Scene Description"
-
- @classmethod
- def poll(cls, context):
- # Only show the panel if Blender was actually built with USD support.
- return getattr(bpy.app.build_options, "usd", False)
-
- def draw(self, context):
- prefs = context.preferences
- experimental = prefs.experimental
-
- layout = self.layout
- layout.use_property_split = True
- layout.use_property_decorate = False
-
- split = layout.split(factor=0.66)
- col = split.split()
- col.prop(experimental, "use_usd_exporter", text="USD Exporter")
- col = split.split()
- url = "https://devtalk.blender.org/t/universal-scene-description-usd-exporter-feedback/10920"
- col.operator("wm.url_open", text='Give Feedback', icon='URL').url = url
-
-
# -----------------------------------------------------------------------------
# Class Registration
@@ -2226,8 +2202,6 @@ classes = (
USERPREF_PT_studiolight_matcaps,
USERPREF_PT_studiolight_world,
- USERPREF_PT_experimental_usd,
-
# Popovers.
USERPREF_PT_ndof_settings,