Merge pull request #1998 from andrewkaufman/docFix

Fix OSL_SHADER_PATHS and APPLESEED_SEARCHPATH for docs.
GafferHQ · Mar 6, 2017 · 5d44828 · 5d44828
2 parents 7bf07c0 + 8820ade
commit 5d44828
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SConstruct b/SConstruct
@@ -1088,8 +1088,8 @@ def buildDocs( target, source, env ) :
 		env["ENV"]["PATH"] += ":" + env.subst( "$APPLESEED_ROOT/bin" )
 		env["ENV"][libraryPathEnvVar] += ":" + env.subst( "$APPLESEED_ROOT/lib" )
 		env["ENV"]["OSLHOME"] = env.subst( "$OSLHOME" )
-		env["ENV"]["OSL_SHADER_PATHS"] = env.subst( "$APPLESEED_ROOT/shaders" )
-		env["ENV"]["APPLESEED_SEARCHPATH"] = env.subst( "$APPLESEED_ROOT/shaders:$LOCATE_DEPENDENCY_APPLESEED_SEARCHPATH" )
+		env["ENV"]["OSL_SHADER_PATHS"] = env.subst( "$APPLESEED_ROOT/shaders/gaffer" )
+		env["ENV"]["APPLESEED_SEARCHPATH"] = env.subst( "$APPLESEED_ROOT/shaders/gaffer:$LOCATE_DEPENDENCY_APPLESEED_SEARCHPATH" )
 
 	# Run any python scripts we find in the document source tree. These are
 	# used to autogenerate source files for processing by sphinx.