Rebase against 1b9d48a7b01e2b715af46bc1f8d5fe6f1529782c.

This commit is contained in:
Alistair Leslie-Hughes
2022-03-04 11:02:37 +11:00
parent 9fa3c96cff
commit 0648126dae
22 changed files with 141 additions and 143 deletions

View File

@@ -44,7 +44,7 @@ index e826cc89c1e..a4815f24958 100644
+ else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS;
+
+ obj = dataformat_to_odf_by_type(df, inst, type);
+ TRACE("obj %p, inst 0x%08x, type 0x%08x\n", obj, inst, type);
+ TRACE("obj %p, inst 0x%08lx, type 0x%08lx\n", obj, inst, type);
+ if(obj)
+ {
+ memcpy(&obj_df[action], obj, df->dwObjSize);