Skip to content

Commit

Permalink
Added support for nuke icon, using new icon for nuke menu
Browse files Browse the repository at this point in the history
  • Loading branch information
lucienfostier committed Jul 23, 2019
1 parent 683fe95 commit 179105b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 2 deletions.
12 changes: 12 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,12 @@ o.Add(
"$INSTALL_PREFIX/maya/icons",
)

o.Add(
"INSTALL_NUKEICON_DIR",
"The directory under which to install nuke icons.",
"$INSTALL_PREFIX/nuke/icons",
)

o.Add(
"INSTALL_MAYAPLUGIN_NAME",
"The name under which to install maya plugins.",
Expand Down Expand Up @@ -2445,6 +2451,12 @@ if doConfigure :
nukeStubs.append( nukeStub )
Default( [ nukeStub ] )

# nuke icons
nukeIcons = glob.glob( "icons/IECoreNuke/*.png" )
nukeIconInstall = nukeEnv.Install( "$INSTALL_NUKEICON_DIR", source=nukeIcons )
nukeEnv.Alias( "install", nukeIconInstall )
nukeEnv.Alias( "installNuke", nukeIconInstall )

# nuke tests

nukeTest = nukeTestEnv.Command( "test/IECoreNuke/resultsPython.txt", nukeLibrary, "echo \"execfile( '$TEST_NUKE_SCRIPT' )\" | $NUKE_ROOT/Nuke${NUKE_MAJOR_VERSION}.${NUKE_MINOR_VERSION} -t" )
Expand Down
6 changes: 5 additions & 1 deletion config/ie/options
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,10 @@ if getOption( "RELEASE", "0" )!="1" :

basePrefix = os.path.join( installPrefix, "base" )
if targetApp :
appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion )
if targetApp in ( "nuke", ):
appPrefix = os.path.join( installPrefix, targetApp, compatibilityVersion )
else:
appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion )

# find 3delight. we only build the 3delight stuff if the compiler we're building with is suitable.
dlReg = None
Expand Down Expand Up @@ -311,6 +314,7 @@ if targetApp=="nuke" :
NUKE_LICENSE_FILE = nukeReg["wrapperEnvVars"]["foundry_LICENSE"]
INSTALL_NUKELIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_MAJOR_VERSION" )
INSTALL_NUKEPYTHON_DIR = os.path.join( appPrefix, "python" )
INSTALL_NUKEICON_DIR = os.path.join( appPrefix, "icons" )
INSTALL_NUKEPLUGIN_NAME = os.path.join( appPrefix, "plugins", "$IECORE_NAME" )

# find houdini if we're building for houdini
Expand Down
Binary file added icons/IECoreNuke/CortexMenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/IECoreNuke/plugin/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import nuke

nodesMenu = nuke.menu( "Nodes" )
cortexMenu = nodesMenu.addMenu( "Cortex" )
cortexMenu = nodesMenu.addMenu( "Cortex", icon="CortexMenu.png" )

cortexMenu.addCommand( "Display", "nuke.createNode( 'ieDisplay' )" )
cortexMenu.addCommand( "LensDistort", "nuke.createNode( 'ieLensDistort' )" )
Expand Down

0 comments on commit 179105b

Please sign in to comment.