Added TextureWeights uniform support and controls to osgFX::MultiTextureControl to support usage with shaders.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14668 16af8721-9629-0410-8352-f15c8da7e697
2015-01-21 11:09:29 +00:00
parent 3ab06c54bf
commit 7fbeeefea8
4 changed files with 121 additions and 116 deletions
--- a/src/osgTerrain/GeometryTechnique.cpp
+++ b/src/osgTerrain/GeometryTechnique.cpp
@@ -22,7 +22,6 @@
 #include <osg/io_utils>
 #include <osg/Texture2D>
 #include <osg/Texture1D>
-#include <osg/TexEnvCombine>
 #include <osg/Program>
 #include <osg/Math>
 #include <osg/Timer>