[Bf-blender-cvs] [02d6550dd0f] temp-usd-prev-export2: USD Preview Surface material export.

Michael Kowalski noreply at git.blender.org
Tue Dec 28 06:13:51 CET 2021


Commit: 02d6550dd0f5f81ae6e574b384850a3aa164eca6
Author: Michael Kowalski
Date:   Tue Dec 21 11:36:06 2021 -0500
Branches: temp-usd-prev-export2
https://developer.blender.org/rB02d6550dd0f5f81ae6e574b384850a3aa164eca6

USD Preview Surface material export.

Added "USD Preview Surface From Nodes" export option,
to convert a Principled BSDF material node tree to an
approximate USD Preview Surface shader representation.

Also added the following options for texture export.

Export Textures: If converting Preview Surface, export
textures referenced by shader nodes to a 'textures'
directory next to the USD file.

Overwrite Textures: Allow overwriting existing texture
files when exporting textures (this option is off by
default).

Relative Texture Paths: Save material texture asset
paths as relative paths in the USD.

USD export format fixes.

USD export: fixed typo in comparison.

Differential Revision: https://developer.blender.org/D13647

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

M	source/blender/io/usd/intern/usd_writer_abstract.cc

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

diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc
index e6021fa33fe..6ec9d835c89 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.cc
+++ b/source/blender/io/usd/intern/usd_writer_abstract.cc
@@ -74,7 +74,7 @@ static std::string get_active_uvlayer_name(Mesh *me)
  * assuming the Object is of type MESH. */
 static std::string get_active_uvlayer_name(Object *ob)
 {
-  if (!ob || !ob->type == OB_MESH) {
+  if (!ob || ob->type != OB_MESH) {
     return "";
   }
   Mesh *me = static_cast<Mesh *>(ob->data);



More information about the Bf-blender-cvs mailing list