Skip to content

Commit

Permalink
Fixed asset options not serializing.
Browse files Browse the repository at this point in the history 
backports of r445873, r445894, r445896
  • Loading branch information
@andys-sidefx
andys-sidefx committed May 26, 2023
1 parent 1f272e8 commit b3d18bb
Showing 1 changed file with 59 additions and 5 deletions.
64 changes: 59 additions & 5 deletions Source/HoudiniEngineEditor/Private/HoudiniEngineDetails.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,12 @@ FHoudiniEngineDetails::CreateGenerateWidgets(
if (NextHAC->TemporaryCookFolder.Path.Equals(NewPathStr))
continue;

if (NextHAC->TemporaryCookFolder.Path == NewPathStr)
continue;

NextHAC->TemporaryCookFolder.Path = NewPathStr;
NextHAC->MarkPackageDirty();

}
};

Expand Down Expand Up @@ -650,6 +655,7 @@ FHoudiniEngineDetails::CreateBakeWidgets(
continue;

NextHAC->BakeFolder.Path = NewPathStr;
NextHAC->MarkPackageDirty();
}
};

Expand Down Expand Up @@ -761,7 +767,11 @@ FHoudiniEngineDetails::CreateBakeWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (MainHAC->HoudiniEngineBakeOption == NewOption)
continue;

MainHAC->HoudiniEngineBakeOption = NewOption;
NextHAC->MarkPackageDirty();
}

if (MainHAC.IsValid())
Expand Down Expand Up @@ -848,7 +858,11 @@ FHoudiniEngineDetails::CreateBakeWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (NextHAC->bRemoveOutputAfterBake == bNewState)
continue;

NextHAC->bRemoveOutputAfterBake = bNewState;
NextHAC->MarkPackageDirty();
}

// FHoudiniEngineUtils::UpdateEditorProperties(MainHAC, true);
Expand Down Expand Up @@ -886,7 +900,11 @@ FHoudiniEngineDetails::CreateBakeWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (NextHAC->bRecenterBakedActors == bNewState)
continue;

NextHAC->bRecenterBakedActors = bNewState;
NextHAC->MarkPackageDirty();
}

// FHoudiniEngineUtils::UpdateEditorProperties(MainHAC, true);
Expand All @@ -905,7 +923,12 @@ FHoudiniEngineDetails::CreateBakeWidgets(
continue;

const bool bState = NextHAC->IsBakeAfterNextCookEnabled();

if (NextHAC->IsBakeAfterNextCookEnabled() == bState)
continue;

This comment has been minimized.

Sign in to view

Copy link
@KeyToon9

KeyToon9 Aug 17, 2023

This will cause "Auto Bake" to fail to execute properly

NextHAC->SetBakeAfterNextCookEnabled(bState);
NextHAC->MarkPackageDirty();
OnBakeAfterCookChangedHelper(bState, NextHAC.Get());
}

Expand Down Expand Up @@ -939,7 +962,11 @@ FHoudiniEngineDetails::CreateBakeWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (NextHAC->IsBakeAfterNextCookEnabled() == bNewState)
continue;

NextHAC->SetBakeAfterNextCookEnabled(bNewState);
NextHAC->MarkPackageDirty();
OnBakeAfterCookChangedHelper(bNewState, NextHAC.Get());
}

Expand Down Expand Up @@ -979,7 +1006,11 @@ FHoudiniEngineDetails::CreateBakeWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (NextHAC->bReplacePreviousBake == bNewState)
continue;

NextHAC->bReplacePreviousBake = bNewState;
NextHAC->MarkPackageDirty();
}

if (MainHAC.IsValid())
Expand Down Expand Up @@ -1146,7 +1177,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (NextHAC->bCookOnParameterChange == bChecked)
continue;

NextHAC->bCookOnParameterChange = bChecked;
NextHAC->MarkPackageDirty();
}
};

Expand All @@ -1166,8 +1201,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

NextHAC->bCookOnTransformChange = bChecked;
if (NextHAC->bCookOnTransformChange == bChecked)
continue;

NextHAC->bCookOnTransformChange = bChecked;
NextHAC->MarkPackageDirty();
NextHAC->MarkAsNeedCook();
}
};
Expand All @@ -1188,7 +1226,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

if (NextHAC->bCookOnAssetInputCook == bChecked)
continue;

NextHAC->bCookOnAssetInputCook = bChecked;
NextHAC->MarkPackageDirty();
}
};

Expand All @@ -1208,8 +1250,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

NextHAC->bUploadTransformsToHoudiniEngine = bChecked;
if (NextHAC->bUploadTransformsToHoudiniEngine == bChecked)
continue;

NextHAC->bUploadTransformsToHoudiniEngine = bChecked;
NextHAC->MarkPackageDirty();
NextHAC->MarkAsNeedCook();
}
};
Expand All @@ -1230,8 +1275,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

NextHAC->bOutputless = bChecked;
if (NextHAC->bOutputless == bChecked)
continue;

NextHAC->bOutputless = bChecked;
NextHAC->MarkPackageDirty();
NextHAC->MarkAsNeedCook();
}
};
Expand All @@ -1252,8 +1300,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

NextHAC->bOutputTemplateGeos = bChecked;
if (NextHAC->bOutputTemplateGeos == bChecked)
continue;

NextHAC->bOutputTemplateGeos = bChecked;
NextHAC->MarkPackageDirty();
NextHAC->MarkAsNeedCook();
}
};
Expand All @@ -1274,8 +1325,11 @@ FHoudiniEngineDetails::CreateAssetOptionsWidgets(
if (!IsValidWeakPointer(NextHAC))
continue;

NextHAC->bUseOutputNodes = bChecked;
if (NextHAC->bUseOutputNodes == bChecked)
continue;

NextHAC->bUseOutputNodes = bChecked;
NextHAC->MarkPackageDirty();
NextHAC->MarkAsNeedCook();
}
};
Expand Down

0 comments on commit b3d18bb

Please sign in to comment.