Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SubAssetでも中を見れるように、デフォルトで AdvancedMode にする #1168

Merged
merged 3 commits into from
Aug 25, 2021

Conversation

ousttrue
Copy link
Contributor

@ousttrue ousttrue requested a review from Santarh August 24, 2021 12:06
Santarh
Santarh previously approved these changes Aug 25, 2021
@@ -23,7 +23,10 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro

using (new LabelScope("Editor Settings"))
{
var backup = GUI.enabled;
GUI.enabled = true;
PopupEnum<MToon10EditorEditMode>("Edit Mode", props[MToon10Prop.EditorEditMode], materialEditor);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PopupEnumMaterialProperty に対して副作用があるので SubAsset を変更してしまうと思う。
とはいえ、あまり本質的なプロパティではないのでまあ大丈夫か

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dirty flagundo に悪さするかもしれないので、UI の状態を Editor に移動できるか見てみます

@ousttrue ousttrue changed the title SubAssetでもモードを変えて中を見れる SubAssetでもモードを変えて中を見れるように、デフォルトで AdvancedMode にする Aug 25, 2021
@ousttrue
Copy link
Contributor Author

ousttrue commented Aug 25, 2021

  • Material 個別の設定である
  • glTFのシリアライズ対象外
  • Import時にデフォルトで AdvancedMode にする

に変更しました

@ousttrue ousttrue changed the title SubAssetでもモードを変えて中を見れるように、デフォルトで AdvancedMode にする SubAssetでも中を見れるように、デフォルトで AdvancedMode にする Aug 25, 2021
// UI
if (true /* TODO: mToon.IsAdvancedMode */)
{
yield return (MToon10Prop.EditorEditMode.ToUnityShaderLabName(), 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

拝承

@ousttrue ousttrue merged commit 3cfed7d into vrm-c:master Aug 25, 2021
@ousttrue ousttrue deleted the fix10/enable_editor_mode_if_subasset branch October 27, 2021 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants