From 3401f32dfe42180777d71c812fd00fa02e20b1d7 Mon Sep 17 00:00:00 2001 From: Sebastien Blaineau-Ortega Date: Mon, 3 Oct 2022 16:54:20 +0200 Subject: [PATCH] Support AOV names called "color" for the beauty #1311 --- testsuite/test_1311/README | 8 + testsuite/test_1311/data/test.usda | 116 ++++++++++++++ testsuite/test_1311/ref/reference.log | 215 ++++++++++++++++++++++++++ testsuite/test_1311/ref/reference.tif | Bin 0 -> 10592 bytes translator/reader/read_options.cpp | 6 +- 5 files changed, 344 insertions(+), 1 deletion(-) create mode 100644 testsuite/test_1311/README create mode 100644 testsuite/test_1311/data/test.usda create mode 100644 testsuite/test_1311/ref/reference.log create mode 100644 testsuite/test_1311/ref/reference.tif diff --git a/testsuite/test_1311/README b/testsuite/test_1311/README new file mode 100644 index 0000000000..646ebfcaca --- /dev/null +++ b/testsuite/test_1311/README @@ -0,0 +1,8 @@ +Support AOV names called "color" for the beauty + +See #1311 + +author: sebastien ortega + +PARAMS: {'scene':'test.usda'} + diff --git a/testsuite/test_1311/data/test.usda b/testsuite/test_1311/data/test.usda new file mode 100644 index 0000000000..204da8e749 --- /dev/null +++ b/testsuite/test_1311/data/test.usda @@ -0,0 +1,116 @@ +#usda 1.0 +( + defaultPrim = "grid1" + endTimeCode = 1 + framesPerSecond = 24 + metersPerUnit = 1 + startTimeCode = 1 + timeCodesPerSecond = 24 + upAxis = "Y" +) + +def Sphere "sphere1" +{ + double radius = 1 + matrix4d xformOp:transform = ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 1.3, 0, 1) ) + uniform token[] xformOpOrder = ["xformOp:transform"] +} + +def Xform "grid1" ( + kind = "component" +) +{ + matrix4d xformOp:transform:xform = ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) ) + uniform token[] xformOpOrder = ["xformOp:transform:xform"] + + def Mesh "mesh_0" + { + float3[] extent = [(-5, 0, -5), (5, 0, 5)] + int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4] + int[] faceVertexIndices = [0, 1, 11, 10, 1, 2, 12, 11, 2, 3, 13, 12, 3, 4, 14, 13, 4, 5, 15, 14, 5, 6, 16, 15, 6, 7, 17, 16, 7, 8, 18, 17, 8, 9, 19, 18, 10, 11, 21, 20, 11, 12, 22, 21, 12, 13, 23, 22, 13, 14, 24, 23, 14, 15, 25, 24, 15, 16, 26, 25, 16, 17, 27, 26, 17, 18, 28, 27, 18, 19, 29, 28, 20, 21, 31, 30, 21, 22, 32, 31, 22, 23, 33, 32, 23, 24, 34, 33, 24, 25, 35, 34, 25, 26, 36, 35, 26, 27, 37, 36, 27, 28, 38, 37, 28, 29, 39, 38, 30, 31, 41, 40, 31, 32, 42, 41, 32, 33, 43, 42, 33, 34, 44, 43, 34, 35, 45, 44, 35, 36, 46, 45, 36, 37, 47, 46, 37, 38, 48, 47, 38, 39, 49, 48, 40, 41, 51, 50, 41, 42, 52, 51, 42, 43, 53, 52, 43, 44, 54, 53, 44, 45, 55, 54, 45, 46, 56, 55, 46, 47, 57, 56, 47, 48, 58, 57, 48, 49, 59, 58, 50, 51, 61, 60, 51, 52, 62, 61, 52, 53, 63, 62, 53, 54, 64, 63, 54, 55, 65, 64, 55, 56, 66, 65, 56, 57, 67, 66, 57, 58, 68, 67, 58, 59, 69, 68, 60, 61, 71, 70, 61, 62, 72, 71, 62, 63, 73, 72, 63, 64, 74, 73, 64, 65, 75, 74, 65, 66, 76, 75, 66, 67, 77, 76, 67, 68, 78, 77, 68, 69, 79, 78, 70, 71, 81, 80, 71, 72, 82, 81, 72, 73, 83, 82, 73, 74, 84, 83, 74, 75, 85, 84, 75, 76, 86, 85, 76, 77, 87, 86, 77, 78, 88, 87, 78, 79, 89, 88, 80, 81, 91, 90, 81, 82, 92, 91, 82, 83, 93, 92, 83, 84, 94, 93, 84, 85, 95, 94, 85, 86, 96, 95, 86, 87, 97, 96, 87, 88, 98, 97, 88, 89, 99, 98] + uniform token orientation = "leftHanded" + point3f[] points = [(-5, 0, -5), (-3.8888888, 0, -5), (-2.7777777, 0, -5), (-1.6666665, 0, -5), (-0.55555534, 0, -5), (0.5555558, 0, -5), (1.666667, 0, -5), (2.7777781, 0, -5), (3.8888893, 0, -5), (5, 0, -5), (-5, 0, -3.8888888), (-3.8888888, 0, -3.8888888), (-2.7777777, 0, -3.8888888), (-1.6666665, 0, -3.8888888), (-0.55555534, 0, -3.8888888), (0.5555558, 0, -3.8888888), (1.666667, 0, -3.8888888), (2.7777781, 0, -3.8888888), (3.8888893, 0, -3.8888888), (5, 0, -3.8888888), (-5, 0, -2.7777777), (-3.8888888, 0, -2.7777777), (-2.7777777, 0, -2.7777777), (-1.6666665, 0, -2.7777777), (-0.55555534, 0, -2.7777777), (0.5555558, 0, -2.7777777), (1.666667, 0, -2.7777777), (2.7777781, 0, -2.7777777), (3.8888893, 0, -2.7777777), (5, 0, -2.7777777), (-5, 0, -1.6666665), (-3.8888888, 0, -1.6666665), (-2.7777777, 0, -1.6666665), (-1.6666665, 0, -1.6666665), (-0.55555534, 0, -1.6666665), (0.5555558, 0, -1.6666665), (1.666667, 0, -1.6666665), (2.7777781, 0, -1.6666665), (3.8888893, 0, -1.6666665), (5, 0, -1.6666665), (-5, 0, -0.55555534), (-3.8888888, 0, -0.55555534), (-2.7777777, 0, -0.55555534), (-1.6666665, 0, -0.55555534), (-0.55555534, 0, -0.55555534), (0.5555558, 0, -0.55555534), (1.666667, 0, -0.55555534), (2.7777781, 0, -0.55555534), (3.8888893, 0, -0.55555534), (5, 0, -0.55555534), (-5, 0, 0.5555558), (-3.8888888, 0, 0.5555558), (-2.7777777, 0, 0.5555558), (-1.6666665, 0, 0.5555558), (-0.55555534, 0, 0.5555558), (0.5555558, 0, 0.5555558), (1.666667, 0, 0.5555558), (2.7777781, 0, 0.5555558), (3.8888893, 0, 0.5555558), (5, 0, 0.5555558), (-5, 0, 1.666667), (-3.8888888, 0, 1.666667), (-2.7777777, 0, 1.666667), (-1.6666665, 0, 1.666667), (-0.55555534, 0, 1.666667), (0.5555558, 0, 1.666667), (1.666667, 0, 1.666667), (2.7777781, 0, 1.666667), (3.8888893, 0, 1.666667), (5, 0, 1.666667), (-5, 0, 2.7777781), (-3.8888888, 0, 2.7777781), (-2.7777777, 0, 2.7777781), (-1.6666665, 0, 2.7777781), (-0.55555534, 0, 2.7777781), (0.5555558, 0, 2.7777781), (1.666667, 0, 2.7777781), (2.7777781, 0, 2.7777781), (3.8888893, 0, 2.7777781), (5, 0, 2.7777781), (-5, 0, 3.8888893), (-3.8888888, 0, 3.8888893), (-2.7777777, 0, 3.8888893), (-1.6666665, 0, 3.8888893), (-0.55555534, 0, 3.8888893), (0.5555558, 0, 3.8888893), (1.666667, 0, 3.8888893), (2.7777781, 0, 3.8888893), (3.8888893, 0, 3.8888893), (5, 0, 3.8888893), (-5, 0, 5), (-3.8888888, 0, 5), (-2.7777777, 0, 5), (-1.6666665, 0, 5), (-0.55555534, 0, 5), (0.5555558, 0, 5), (1.666667, 0, 5), (2.7777781, 0, 5), (3.8888893, 0, 5), (5, 0, 5)] ( + interpolation = "vertex" + ) + uniform token subdivisionScheme = "none" + } +} + +def Xform "lights" +{ + def DomeLight "domelight1" + { + color3f color = (1, 1, 1) + float diffuse = 1 + bool enableColorTemperature = 0 + float exposure = 0 + rel filters = None + float intensity = 1 + bool normalize = 0 + rel portals = None + float specular = 1 + asset texture:file = @@ + token texture:format = "automatic" + matrix4d xformOp:transform = ( (1, 0, 0, 0), (0, 1, 0, 0), (0, 0, 1, 0), (0, 0, 0, 1) ) + uniform token[] xformOpOrder = ["xformOp:transform"] + } +} + +def Xform "cameras" +{ + def Camera "camera1" + { + float2 clippingRange = (1, 1000000) + float focalLength = 50 + float focusDistance = 5 + float fStop = 0 + float horizontalAperture = 20.955 + float horizontalApertureOffset = 0 + token projection = "perspective" + double shutter:close = 0.25 + double shutter:open = -0.25 + float verticalAperture = 15.2908 + float verticalApertureOffset = 0 + matrix4d xformOp:transform = ( (0.9514633454010166, 5.551115123125784e-17, -0.3077620872659687, 0), (-0.13241210016549554, 0.9027137050711844, -0.4093592583616711, 0), (0.2778210540763038, 0.43024175375787804, 0.8588990017663758, 0), (5.363992736785748, 8.47881619685509, 17.19747719054302, 1) ) + uniform token[] xformOpOrder = ["xformOp:transform"] + } +} + +def Scope "Render" +{ + def RenderSettings "rendersettings1" + { + custom int arnold:global:AA_samples = 2 + custom int arnold:global:GI_diffuse_depth = 1 + custom int arnold:global:GI_diffuse_samples = 3 + custom int arnold:global:GI_specular_depth = 0 + + token aspectRatioConformPolicy = "expandAperture" + rel camera = + int2 resolution = (160, 120) + rel products = + } + def Scope "Products" + { + def RenderProduct "renderproduct1" + { + rel orderedVars = [ + , + ] + token productName = "testrender.tif" + token productType = "raster" + } + def Scope "Vars" + { + def RenderVar "rendervar1" + { + custom string arnold:filter = "gaussian_filter" + custom float arnold:width = 2 + token dataType = "color4f" + string sourceName = "color" + token sourceType = "raw" + } + } + + } +} diff --git a/testsuite/test_1311/ref/reference.log b/testsuite/test_1311/ref/reference.log new file mode 100644 index 0000000000..a7c87588da --- /dev/null +++ b/testsuite/test_1311/ref/reference.log @@ -0,0 +1,215 @@ +00:00:00 91MB | log started Mon Oct 3 16:34:50 2022 +00:00:00 91MB | Arnold 7.1.4.0 [cbdd12d6] windows clang-10.0.1 oiio-2.4.1 osl-1.12.0 vdb-7.1.1 adlsdk-6.3.1.44 clmhub-2.0.0.235 rlm-14.1.3 optix-6.6.0 2022/08/29 23:41:24 +00:00:00 91MB | running on REMS4QL1726, pid=13820 +00:00:00 91MB | 2 x Intel(R) Xeon(R) Gold 5218 CPU @ 2.30GHz (32 cores, 64 logical) with 65154MB +00:00:00 103MB | NVIDIA driver version 511.65 (Optix 60802) +00:00:00 103MB | GPU 0: Quadro RTX 4000 @ 1545MHz (compute 7.5) with 8191MB (5105MB available) (NVLink:0) +00:00:00 103MB | Windows 10 (version 10.0, build 19044) +00:00:00 103MB | soft limit for open files is set at 2048 +00:00:00 103MB | +00:00:00 121MB | [color_manager_ocio] default ocio.config found in C:\arnold\sdk\latest\bin\../ocio/configs/arnold/config.ocio +00:00:00 121MB | loading plugins from C:\arnold\arnold-usd\build\windows_x86_64\msvc_opt\usd-0.21.8_arnold-7.1.4.0\procedural ... +00:00:00 125MB | usd_proc.dll: usd uses Arnold 7.1.4.0 +00:00:00 125MB | loaded 1 plugins from 1 lib(s) in 0:00.10 +00:00:00 125MB | loading plugins from C:\arnold\sdk\latest\bin\..\plugins ... +00:00:00 125MB | alembic_proc.dll: alembic uses Arnold 7.1.4.0 +00:00:00 125MB | cryptomatte.dll: cryptomatte uses Arnold 7.1.4.0 +00:00:00 125MB | cryptomatte.dll: cryptomatte_filter uses Arnold 7.1.4.0 +00:00:00 125MB | cryptomatte.dll: cryptomatte_manifest_driver uses Arnold 7.1.4.0 +00:00:00 125MB | skipping already loaded plugin: C:\arnold\sdk\latest\bin\..\plugins\usd_proc.dll ... +00:00:00 125MB | loaded 4 plugins from 2 lib(s) in 0:00.01 +00:00:00 125MB | [color_manager_ocio] default ocio.config found in C:\arnold\sdk\latest\bin\../ocio/configs/arnold/config.ocio +00:00:00 141MB | [kick] command: C:\arnold\sdk\latest\bin\kick test.usda -dw -r 160 120 -sm lambert -bs 16 -o testrender.tif -set driver_tiff.dither false -nocrashpopup -dp -v 6 +00:00:00 141MB | loading plugins from . ... +00:00:00 141MB | no plugins loaded +00:00:00 179MB | [kick] applying 2 attr value overrides +00:00:00 179MB | +00:00:00 179MB | authorizing with license manager: network ... +00:00:00 179MB WARNING | rendering with watermarks because of failed authorization: +00:00:00 179MB | [clm.v1] license server was not set (51) +00:00:00 179MB | environment variables: +00:00:00 179MB | ARNOLD_LICENSE_ORDER = (not set) +00:00:00 179MB | ARNOLD_LICENSE_MANAGER = (not set) +00:00:00 179MB | [rlm] solidangle_LICENSE = (not set) +00:00:00 179MB | [rlm] RLM_LICENSE = (not set) +00:00:00 179MB | [clm] ADSKFLEX_LICENSE_FILE = (not set) +00:00:00 179MB | [clm] LM_LICENSE_FILE = (not set) +00:00:00 179MB | +00:00:00 179MB | [color_manager] using color manager of type "color_manager_ocio" +00:00:00 180MB | [color_manager_ocio] using config file C:\arnold\sdk\latest\bin\../ocio/configs/arnold/config.ocio +00:00:00 180MB | [color_manager] rendering color space is "ACEScg" +00:00:00 194MB | +00:00:00 194MB | there are 1 light and 3 objects: +00:00:00 194MB | 1 persp_camera +00:00:00 194MB | 1 skydome_light +00:00:00 194MB | 2 utility +00:00:00 194MB | 1 standard_surface +00:00:00 194MB | 1 user_data_rgb +00:00:00 194MB | 1 driver_tiff +00:00:00 194MB | 1 gaussian_filter +00:00:00 194MB | 1 sphere +00:00:00 194MB | 1 polymesh +00:00:00 194MB | 2 list_aggregate +00:00:00 194MB | 2 color_manager_ocio +00:00:00 194MB | +00:00:00 194MB | rendering image at 160 x 120, 2 AA samples +00:00:00 194MB | AA samples max +00:00:00 194MB | AA sample clamp +00:00:00 194MB | diffuse samples 3 / depth 1 +00:00:00 194MB | specular +00:00:00 194MB | transmission samples 2 / depth 2 +00:00:00 194MB | volume indirect +00:00:00 194MB | total depth 10 +00:00:00 194MB | bssrdf samples 2 +00:00:00 194MB | transparency depth 10 +00:00:00 194MB | initializing 12 nodes +00:00:00 194MB | creating root object list ... +00:00:00 194MB | node initialization done in 0:00.00 (multithreaded) +00:00:00 194MB | updating 13 nodes +00:00:00 194MB | /lights/domelight1: skydome_light using 1 sample, 2 volume samples +00:00:00 195MB | scene bounds: (-5 0 -5) -> (5 2.29999995 5) +00:00:00 195MB | node update done in 0:00.00 (multithreaded) +00:00:00 195MB | [aov] parsing 1 output statements ... +00:00:00 195MB | [aov] registered driver: "/Render/Products/renderproduct1" (driver_tiff) +00:00:00 195MB | [aov] * "RGBA" of type RGBA filtered by "/Render/Products/Vars/rendervar1/filter" (gaussian_filter) +00:00:00 195MB | [aov] done preparing 2 AOVs for 1 output to 1 driver (0 deep AOVs) +00:00:00 197MB | starting 64 bucket workers of size 16x16 ... +00:00:00 198MB | [accel] list_aggregate bvh4 done - 0:00.00 (wall time) - 2 prims, 1 key +00:00:00 201MB | [accel] polymesh bvh4 done - 0:00.00 (wall time) - 81 prims, 1 key +00:00:00 255MB | 0% done - 1214 rays/pixel +00:00:00 260MB | 5% done - 174 rays/pixel +00:00:00 261MB | 10% done - 20 rays/pixel +00:00:00 262MB | 15% done - 51 rays/pixel +00:00:00 271MB | 20% done - 205 rays/pixel +00:00:00 275MB | 25% done - 78 rays/pixel +00:00:00 277MB | 30% done - 85 rays/pixel +00:00:00 280MB | 35% done - 142 rays/pixel +00:00:00 283MB | 40% done - 104 rays/pixel +00:00:00 283MB | 45% done - 23 rays/pixel +00:00:00 284MB | 50% done - 24 rays/pixel +00:00:00 285MB | 55% done - 91 rays/pixel +00:00:00 286MB | 60% done - 77 rays/pixel +00:00:00 287MB | 65% done - 28 rays/pixel +00:00:00 288MB | 70% done - 40 rays/pixel +00:00:00 288MB | 75% done - 38 rays/pixel +00:00:00 289MB | 80% done - 26 rays/pixel +00:00:00 290MB | 85% done - 52 rays/pixel +00:00:00 290MB | 90% done - 22 rays/pixel +00:00:00 291MB | 95% done - 29 rays/pixel +00:00:00 291MB | 100% done - 0 rays/pixel +00:00:00 291MB | render done in 0:00.060 +00:00:00 291MB | [driver_tiff] writing file `testrender.tif' +00:00:00 292MB | render done +00:00:00 292MB | +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | scene creation time 0:00.36 machine utilization (0.87%) +00:00:00 292MB | unaccounted 0:00.36 +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | frame time 0:00.11 machine utilization (30.44%) +00:00:00 292MB | driver init/close 0:00.01 +00:00:00 292MB | rendering 0:00.06 +00:00:00 292MB | pixel rendering 0:00.06 +00:00:00 292MB | unaccounted 0:00.03 +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | top session self-times by category +00:00:00 292MB | surface closure (_default_arnold_shader) 0:00.00 (20.28%) +00:00:00 292MB | AiLightsTrace 0:00.00 (13.01%) +00:00:00 292MB | TraceCameraRay 0:00.00 (10.83%) +00:00:00 292MB | BVH::intersect 0:00.00 (10.39%) +00:00:00 292MB | root 0:00.00 (10.39%) +00:00:00 292MB | AiSceneLoad 0:00.00 ( 6.96%) +00:00:00 292MB | ray traversal+intersection 0:00.00 ( 5.78%) +00:00:00 292MB | polymesh::intersect (/grid1/mesh_0) 0:00.00 ( 5.68%) +00:00:00 292MB | AiMalloc 0:00.00 ( 5.62%) +00:00:00 292MB | sampleNextBatch 0:00.00 ( 4.74%) +00:00:00 292MB | Plugin loader 0:00.00 ( 4.68%) +00:00:00 292MB | standard_surface (_default_arnold_shader) 0:00.00 ( 2.59%) +00:00:00 292MB | accumulateBucketSamples 0:00.00 ( 2.12%) +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | top session self-times by node +00:00:00 292MB | standard_surface:_default_arnold_shader 0:00.02 (45.77%) +00:00:00 292MB | surface closure 0:00.00 (20.28%) +00:00:00 292MB | AiLightsTrace 0:00.00 (13.01%) +00:00:00 292MB | ray traversal+intersection 0:00.00 ( 5.78%) +00:00:00 292MB | TraceShadow 0:00.00 ( 1.51%) +00:00:00 292MB | AiMakeRay 0:00.00 ( 1.04%) +00:00:00 292MB | AiMalloc 0:00.00 ( 1.01%) +00:00:00 292MB | AiShaderEvalParamFuncFlt 0:00.00 ( 0.54%) +00:00:00 292MB | TraceCameraRay 0:00.00 (10.83%) +00:00:00 292MB | list_aggregate:root (BVH::intersect) 0:00.00 (10.39%) +00:00:00 292MB | AiSceneLoad 0:00.00 ( 6.96%) +00:00:00 292MB | polymesh:/grid1/mesh_0 0:00.00 ( 6.19%) +00:00:00 292MB | polymesh::intersect 0:00.00 ( 5.68%) +00:00:00 292MB | AiLightsPrepare 0:00.00 ( 0.50%) +00:00:00 292MB | sampleNextBatch 0:00.00 ( 4.74%) +00:00:00 292MB | Plugin loader 0:00.00 ( 4.68%) +00:00:00 292MB | AiMalloc 0:00.00 ( 4.61%) +00:00:00 292MB | accumulateBucketSamples 0:00.00 ( 2.12%) +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | peak CPU memory used 292.85MB +00:00:00 292MB | at startup 103.65MB +00:00:00 292MB | plugins 0.02MB +00:00:00 292MB | AOV samples 1.53MB +00:00:00 292MB | output buffers 0.33MB +00:00:00 292MB | framebuffers 0.31MB +00:00:00 292MB | node overhead 0.01MB +00:00:00 292MB | message passing 0.13MB +00:00:00 292MB | memory pools 77.05MB +00:00:00 292MB | geometry 0.00MB +00:00:00 292MB | polymesh 0.00MB +00:00:00 292MB | accel structs 0.02MB +00:00:00 292MB | strings 24.25MB +00:00:00 292MB | profiler 0.03MB +00:00:00 292MB | unaccounted 85.53MB +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | ray counts ( /pixel, /sample) (% total) (avg. hits) (max hits) +00:00:00 292MB | camera 86880 ( 4.53, 1.00) ( 5.74%) ( 0.73) ( 1) +00:00:00 292MB | shadow 858107 ( 44.69, 9.88) ( 56.74%) ( 0.10) ( 1) +00:00:00 292MB | diffuse_reflect 567441 ( 29.55, 6.53) ( 37.52%) ( 0.07) ( 1) +00:00:00 292MB | total 1512428 ( 78.77, 17.41) (100.00%) ( 0.12) ( 1) +00:00:00 292MB | by ray depth: 0 1 +00:00:00 292MB | total 59.9% 40.1% +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | shader calls ( /pixel, /sample) (% total) +00:00:00 292MB | primary 204640 ( 10.66, 2.36) (100.00%) +00:00:00 292MB | total 204640 ( 10.66, 2.36) (100.00%) +00:00:00 292MB | by ray depth: 0 1 +00:00:00 292MB | total 61.6% 38.4% +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | geometry (% hit ) (instances) ( init mem, final mem) +00:00:00 292MB | lists 1 (100.0%) ( 0) ( 0.00, 0.00) +00:00:00 292MB | polymeshes 1 (100.0%) ( 0) ( 0.00, 0.00) +00:00:00 292MB | simple 1 (100.0%) ( 0) ( 0.00, 0.00) +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | geometric elements ( min) ( avg.) ( max) +00:00:00 292MB | polygons 81 ( 81) ( 81.0) ( 81) +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | triangle tessellation ( min) ( avg.) ( max) (/ element) (% total) +00:00:00 292MB | polymeshes 162 ( 162) ( 162.0) ( 162) ( 2.00) (100.00%) +00:00:00 292MB | unique triangles 162 +00:00:00 292MB | CPU memory use 0.00MB +00:00:00 292MB | vertices 0.00MB +00:00:00 292MB | vertex indices 0.00MB +00:00:00 292MB | packed normals 0.00MB +00:00:00 292MB | normal indices 0.00MB +00:00:00 292MB | uniform indices 0.00MB +00:00:00 292MB | largest polymeshes by triangle count +00:00:00 292MB | 162 tris -- /grid1/mesh_0 +00:00:00 292MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | acceleration structures: (% total) +00:00:00 292MB | bvh 2 (100.00%) +00:00:00 292MB | total 2 (100.00%) +00:00:00 293MB | ----------------------------------------------------------------------------------- +00:00:00 293MB | number of warnings, warning type: +00:00:00 293MB | 1: rendering with watermarks because of failed authorization: +00:00:00 293MB | ----------------------------------------------------------------------------------- +00:00:00 292MB | +00:00:00 292MB | releasing resources +00:00:00 202MB | +00:00:00 202MB | releasing resources +00:00:00 182MB | unloading 3 plugins +00:00:00 182MB | closing usd_proc.dll ... +00:00:00 182MB | closing alembic_proc.dll ... +00:00:00 181MB | closing cryptomatte.dll ... +00:00:00 181MB | unloading plugins done +00:00:00 181MB | Arnold shutdown diff --git a/testsuite/test_1311/ref/reference.tif b/testsuite/test_1311/ref/reference.tif new file mode 100644 index 0000000000000000000000000000000000000000..1352726b96cb5d6f39e7278f17b4e6511c6eb69a GIT binary patch literal 10592 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 z zD%`tV^88w!=eFZN2||)H#x32_ePe!}JyF%NQT6d-x@Qg5@9g2rZ}h&C;R39GWkm<> zt+;<1Cjb65KuLvR%7PIEsU;VQi9TQCW>oURs*%>ux++wlckzH76`+xS`NZt!lq@|z z@L3A>g_t)qv1V*wEstb3;%6)bty*rhuWd%&)SXKm(G%#NVN-mp;cdz|fCwbsl%n^! zl;Kxg^8n_$%+02e`G+abXm@=%q?JUsI{hbL^qWWT1a^r&en{BQ-KC2>RzPbhyCR_F zo`@xU7eCgPuCufCI!)J8hZ<9pJ@+F_As*H+e!s|QJ;@*LBg8bmnoPYxQOU^VpG0`#q+zduZn7;i#l)F)>XdV^hI|CCxM+!Fo-1IsGW^b`rG(Z zULrNV@Pn{4hcZ^7`r!`!^w5H_L_aA)aGaLJ zIj!l#WcBcjsTnn=0buPHo~mc+p}k~hRV-pFHdD?DvUcDLa(Nr0*#XtzQdY0fb(L0$ p_zg8o6#6VUzA>_LB7baQQf1%?gB~OIaYnJ4d#lvV3z^Ev{U6Ylabf@f literal 0 HcmV?d00001 diff --git a/translator/reader/read_options.cpp b/translator/reader/read_options.cpp index e14de65992..8c13ed1af3 100644 --- a/translator/reader/read_options.cpp +++ b/translator/reader/read_options.cpp @@ -377,7 +377,11 @@ void UsdArnoldReadRenderSettings::Read(const UsdPrim &prim, UsdArnoldReaderConte VtValue sourceNameValue; std::string sourceName = renderVar.GetSourceNameAttr().Get(&sourceNameValue, time.frame) ? VtValueGetString(sourceNameValue, nullptr) : "RGBA"; - + + // we want to consider "color" as referring to the beauty, just like "RGBA" (see #1311) + if (sourceName == "color") + sourceName = "RGBA"; + // The source Type will tell us if this AOV is a LPE, a primvar, etc... TfToken sourceType; renderVar.GetSourceTypeAttr().Get(&sourceType, time.frame);