Include materialball shape asset info

Includes spectatorGameplay by default for streamline testing for now
Adds in reparentItem for GuiTreeViewCtrl
Added gitignore to shaderCache/.gitignore
Fixed material asset import logic to properly parent included images to the material
Includes D3D_Compiler47.dll for dependency compliance, and modified cmake file to not install said dll if not using D3D11 API
This commit is contained in:
Areloch 2019-05-25 03:37:18 -05:00
parent 729391eeeb
commit d1308c3aba
105 changed files with 3192 additions and 335 deletions

View file

@ -485,6 +485,8 @@ class GuiTreeViewCtrl : public GuiArrayCtrl
const Vector< Item* >& getSelectedItems() const { return mSelectedItems; }
const Vector< S32 >& getSelected() const { return mSelected; }
const Vector< Item* >& getItems() const { return mItems; }
bool isSelected(S32 itemId)
{
return isSelected( getItem( itemId ) );
@ -580,6 +582,10 @@ class GuiTreeViewCtrl : public GuiArrayCtrl
/// Clear the current item filtering pattern.
void clearFilterText() { setFilterText( String::EmptyString ); }
void reparentItems(Vector<Item*> selectedItems, Item* newParent);
S32 getTabLevel(S32 itemId);
/// @}
// GuiControl