[Bf-blender-cvs] [3f2a1fa87cb] temp-usd-latest-master: USD export: fix build errors with latest master.

Michael Kowalski noreply at git.blender.org
Fri Oct 22 18:25:26 CEST 2021


Commit: 3f2a1fa87cbf30e012b068a9111f7f68f356ad55
Author: Michael Kowalski
Date:   Fri Oct 22 12:17:59 2021 -0400
Branches: temp-usd-latest-master
https://developer.blender.org/rB3f2a1fa87cbf30e012b068a9111f7f68f356ad55

USD export: fix build errors with latest master.

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

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

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

diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc
index 2ae8cb1191f..358ae5122fd 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -811,9 +811,12 @@ static const std::map<int, std::string> node_displacement_conversion = {
     {SHD_SPACE_BLENDER_WORLD, "blender_world"},
 };
 static const std::map<int, std::string> node_sss_falloff_conversion = {
+#ifdef DNA_DEPRECATED_ALLOW
     {SHD_SUBSURFACE_CUBIC, "cubic"},
     {SHD_SUBSURFACE_GAUSSIAN, "gaussian"},
+#endif
     {SHD_SUBSURFACE_BURLEY, "burley"},
+    {SHD_SUBSURFACE_RANDOM_WALK_FIXED_RADIUS, "random_walk"},
     {SHD_SUBSURFACE_RANDOM_WALK, "random_walk"},
 };
 static const std::map<int, std::string> node_principled_hair_parametrization_conversion = {



More information about the Bf-blender-cvs mailing list