Implement more suggestions from Copilot

Author: lanierd-adsk

lib/mayaHydra/hydraExtensions/mixedUtils.cpp

@@ -743,6 +743,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(handle.asBool());
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kByte:
@@ -753,6 +754,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(static_cast<int>(handle.asChar()));
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kShort: {
@@ -762,6 +764,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(handle.asShort());
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kInt: {
@@ -771,6 +774,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(handle.asInt());
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kInt64: {
@@ -780,6 +784,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(handle.asInt64());
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kFloat: {
@@ -789,6 +794,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(handle.asFloat());
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kDouble: {
@@ -798,6 +804,7 @@ bool ExtractNumericDataFromPlug(
             return false;
         }
         outValue = VtValue(handle.asDouble());
+        supportsDefault = true;
         return true;
     }
     case MFnNumericData::kAddr: {
@@ -809,6 +816,7 @@ bool ExtractNumericDataFromPlug(
         void*  ptr = handle.asAddr();
         MInt64 val = static_cast<MInt64>(reinterpret_cast<intptr_t>(ptr));
         outValue = VtValue(val);
+        supportsDefault = true;
         return true;
     }
     default:
@@ -1644,6 +1652,16 @@ void GetExtensionAttributesFromNode(
             case MFn::kMatrixAttribute: {
                 MStatus          matrixStatus;
                 MObject          dataObj = attrPlug.asMObject();
+                if (dataObj.isNull()) {
+                    attrPlug.getValue(dataObj);
+                }
+                if (dataObj.isNull()) {
+                    MStatus     handleStatus;
+                    MDataHandle handle = attrPlug.asMDataHandle(&handleStatus);
+                    if (handleStatus) {
+                        dataObj = handle.data();
+                    }
+                }
                 if (dataObj.isNull()) {
                     break;
                 }

test/lib/mayaUsd/render/mayaToHydra/cpp/testCustomAttributes.py

@@ -88,7 +88,21 @@ def _create_numeric_attr(node_fn, name, numeric_type, default_value=None):
             name + "W", name + "W", om.MFnNumericData.kDouble, 0.0)
         attr_obj = numeric_attr.create(name, name, child1, child2, child3, child4)
     else:
-        default_val = 0.0 if default_value is None else default_value
+        if default_value is None:
+            # Use integer-like defaults for boolean/integer types,
+            # and floating defaults for float/double types.
+            if numeric_type in (
+                om.MFnNumericData.kBoolean,
+                om.MFnNumericData.kByte,
+                om.MFnNumericData.kShort,
+                om.MFnNumericData.kInt,
+                om.MFnNumericData.kInt64,
+            ):
+                default_val = 0
+            else:
+                default_val = 0.0
+        else:
+            default_val = default_value
         attr_obj = numeric_attr.create(name, name, numeric_type, default_val)
     numeric_attr.keyable = True
     numeric_attr.storable = True
@@ -463,7 +477,8 @@ class TestCustomAttributes(mtohUtils.MayaHydraBaseTestCase):
     def setUp(self):
         mayaUtils.openNewScene()
         modified = cmds.file(query=True, modified=True)
-        assert not modified, (
+        self.assertFalse(
+            modified,
             'Internal test framework error: scene left as modified by mayaUtils.openNewScene()')
         cmds.file(modified=False)