Merge pull request #1620 from John3/spaceFolderSceneTree2

Bug space folder in scene tree 2
This commit is contained in:
Areloch 2016-05-31 23:28:45 -05:00
commit 823fc41abc
4 changed files with 18 additions and 6 deletions

View file

@ -380,7 +380,8 @@ function ShapeEdSelectWindow::navigate( %this, %address )
// Ignore assets in the tools folder
%fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );
%splitPath = strreplace( %fullPath, "/", " " );
%splitPath = strreplace( %fullPath, " ", "_" );
%splitPath = strreplace( %splitPath, "/", " " );
if ( getWord( %splitPath, 0 ) $= "tools" )
{
%fullPath = findNextFileMultiExpr( %filePatterns );
@ -393,6 +394,7 @@ function ShapeEdSelectWindow::navigate( %this, %address )
// Add this file's path ( parent folders ) to the
// popup menu if it isn't there yet.
%temp = strreplace( %pathFolders, " ", "/" );
%temp = strreplace( %temp, "_", " " );
%r = ShapeEdSelectMenu.findText( %temp );
if ( %r == -1 )
ShapeEdSelectMenu.add( %temp );

View file

@ -318,7 +318,8 @@ function EWCreatorWindow::navigate( %this, %address )
}
%fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );
%splitPath = strreplace( %fullPath, "/", " " );
%splitPath = strreplace( %fullPath, " ", "_" );
%splitPath = strreplace( %splitPath, "/", " " );
if( getWord(%splitPath, 0) $= "tools" )
{
%fullPath = findNextFileMultiExpr( getFormatExtensions() );
@ -332,6 +333,7 @@ function EWCreatorWindow::navigate( %this, %address )
// Add this file's path (parent folders) to the
// popup menu if it isn't there yet.
%temp = strreplace( %pathFolders, " ", "/" );
%temp = strreplace( %temp, "_", " " );
%r = CreatorPopupMenu.findText( %temp );
if ( %r == -1 )
{
@ -430,7 +432,8 @@ function EWCreatorWindow::navigate( %this, %address )
while ( %fullPath !$= "" )
{
%fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );
%splitPath = strreplace( %fullPath, "/", " " );
%splitPath = strreplace( %fullPath, " ", "_" );
%splitPath = strreplace( %splitPath, "/", " " );
if( getWord(%splitPath, 0) $= "tools" )
{
%fullPath = findNextFile( %expr );
@ -444,6 +447,7 @@ function EWCreatorWindow::navigate( %this, %address )
// Add this file's path (parent folders) to the
// popup menu if it isn't there yet.
%temp = strreplace( %pathFolders, " ", "/" );
%temp = strreplace( %temp, "_", " " );
%r = CreatorPopupMenu.findText( %temp );
if ( %r == -1 )
{

View file

@ -380,7 +380,8 @@ function ShapeEdSelectWindow::navigate( %this, %address )
// Ignore assets in the tools folder
%fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );
%splitPath = strreplace( %fullPath, "/", " " );
%splitPath = strreplace( %fullPath, " ", "_" );
%splitPath = strreplace( %splitPath, "/", " " );
if ( getWord( %splitPath, 0 ) $= "tools" )
{
%fullPath = findNextFileMultiExpr( %filePatterns );
@ -393,6 +394,7 @@ function ShapeEdSelectWindow::navigate( %this, %address )
// Add this file's path ( parent folders ) to the
// popup menu if it isn't there yet.
%temp = strreplace( %pathFolders, " ", "/" );
%temp = strreplace( %temp, "_", " " );
%r = ShapeEdSelectMenu.findText( %temp );
if ( %r == -1 )
ShapeEdSelectMenu.add( %temp );

View file

@ -318,7 +318,8 @@ function EWCreatorWindow::navigate( %this, %address )
}
%fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );
%splitPath = strreplace( %fullPath, "/", " " );
%splitPath = strreplace( %fullPath, " ", "_" );
%splitPath = strreplace( %splitPath, "/", " " );
if( getWord(%splitPath, 0) $= "tools" )
{
%fullPath = findNextFileMultiExpr( getFormatExtensions() );
@ -332,6 +333,7 @@ function EWCreatorWindow::navigate( %this, %address )
// Add this file's path (parent folders) to the
// popup menu if it isn't there yet.
%temp = strreplace( %pathFolders, " ", "/" );
%temp = strreplace( %temp, "_", " " );
%r = CreatorPopupMenu.findText( %temp );
if ( %r == -1 )
{
@ -430,7 +432,8 @@ function EWCreatorWindow::navigate( %this, %address )
while ( %fullPath !$= "" )
{
%fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );
%splitPath = strreplace( %fullPath, "/", " " );
%splitPath = strreplace( %fullPath, " ", "_" );
%splitPath = strreplace( %splitPath, "/", " " );
if( getWord(%splitPath, 0) $= "tools" )
{
%fullPath = findNextFile( %expr );
@ -444,6 +447,7 @@ function EWCreatorWindow::navigate( %this, %address )
// Add this file's path (parent folders) to the
// popup menu if it isn't there yet.
%temp = strreplace( %pathFolders, " ", "/" );
%temp = strreplace( %temp, "_", " " );
%r = CreatorPopupMenu.findText( %temp );
if ( %r == -1 )
{