浏览代码

Merge branch 'master' into feature/create-processor-and-material-from-menu

/feature-create-processor-and-material-from-menu
Thomas ICHÉ 3 年前
当前提交
9629d19d
共有 4 个文件被更改,包括 231 次插入127 次删除
  1. 7
      CHANGELOG.md
  2. 330
      DCC-Tools~/Houdini/Unity_VFX_Tools.hda
  3. 10
      Editor/ImageSequencer/ImageSequencer.GUI.cs
  4. 11
      Editor/ImageSequencer/ImageSequencer.cs

7
CHANGELOG.md


The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [2.1.0-preview] - 2020 - XX - XX
## [2.1.0-preview] - 2021 - XX - XX
* Fixed ImageSequencer for 21.1 and newer versions
* Houdini Exporters: Upgraded to Python3
* Houdini Exporters: Added X Axis Inversion options to match Unity's 3D Space
## [2.0.0-preview] - 2020-03-23

## [1.0.0-preview] - 2019-06-28
* Initial Version
* Initial Version

330
DCC-Tools~/Houdini/Unity_VFX_Tools.hda
文件差异内容过多而无法显示
查看文件

10
Editor/ImageSequencer/ImageSequencer.GUI.cs


private ReorderableList m_InputFramesReorderableList;
private ReorderableList m_ProcessorsReorderableList;
private Vector2 m_OptionsViewScroll = Vector2.zero;
private Vector2 m_MinimumSize;
private SidePanelMode m_SidePanelViewMode = 0;
private bool m_Dirty = true;
private bool m_NeedRedraw = false;

minSize = m_MinimumSize;
if(m_Splitter == null)
{
m_Splitter = new Splitter(360, DrawEditPanelGUI, DrawCanvasGUI, Splitter.SplitLockMode.LeftMinMax, new Vector2(320.0f, 480.0f));

public void OnGUI()
{
if(EditorGUIUtility.isProSkin)
titleContent = styles.proTitle;
else
titleContent = styles.title;
m_MinimumSize = new Vector2(880, 320);
InitializeGUI();
if(m_CurrentAsset == null)

11
Editor/ImageSequencer/ImageSequencer.cs


void OnEnable()
{
if (EditorGUIUtility.isProSkin)
titleContent = styles.proTitle;
else
titleContent = styles.title;
m_ProcessorDataProvider = null;
if(Selection.activeObject != null && Selection.activeObject is ImageSequence)

LoadAsset(m_CurrentAsset);
DefaultView();
}
minSize = new Vector2(880, 320);
}

// Construct the RList
if (m_CurrentAsset.inheritSettingsReference == null)
{
#if UNITY_2020_1_OR_NEWER
m_ProcessorsReorderableList = new ReorderableList(m_CurrentAsset.processorInfos, typeof(ProcessorInfo), true, false, true, true);
#else
#endif
m_ProcessorsReorderableList.onAddCallback = ShowAddProcessorMenu;
m_ProcessorsReorderableList.onRemoveCallback = MenuRemoveProcessor;
m_ProcessorsReorderableList.onReorderCallback = ReorderProcessor;

正在加载...
取消
保存