Ignacio Lillo ed2e48f651 Merge branch 'upstream-dev' into dev ... Conflicts: examples/common/d3d11Utils.h examples/common/glUtils.cpp examples/glViewer/glViewer.cpp		2015-05-21 22:47:36 -03:00
..
common	Merge branch 'upstream-dev' into dev	2015-05-21 22:47:36 -03:00
dxPtexViewer	dxViwer/dxPtexViewer enable back-face culling	2015-05-20 18:28:11 -07:00
dxViewer	dxViwer/dxPtexViewer enable back-face culling	2015-05-20 18:28:11 -07:00
farViewer	Amendment to previous commit deprecating PatchTables::Evaluate methods:	2015-05-20 16:40:32 -07:00
glEvalLimit	osd layer: Add GLPatchTable and retire DrawContext	2015-05-20 15:55:06 -07:00
glFVarViewer	osd layer: Add GLPatchTable and retire DrawContext	2015-05-20 15:55:06 -07:00
glImaging	osd layer: Add GLPatchTable and retire DrawContext	2015-05-20 15:55:06 -07:00
glPaintTest	osd layer: Add GLPatchTable and retire DrawContext	2015-05-20 15:55:06 -07:00
glPtexViewer	osd layer: Add GLPatchTable and retire DrawContext	2015-05-20 15:55:06 -07:00
glShareTopology	remove SupportsAdaptiveTessellation from OsdDrawContext, and example cleanups	2015-05-19 10:30:16 -07:00
glStencilViewer	remove SupportsAdaptiveTessellation from OsdDrawContext, and example cleanups	2015-05-19 10:30:16 -07:00
glViewer	Merge branch 'upstream-dev' into dev	2015-05-21 22:47:36 -03:00
mayaPolySmooth	Refurbish osd layer API.	2015-05-08 17:31:26 -07:00
CMakeLists.txt	Renamed vtrViewer to farViewer.	2015-05-18 19:46:22 -07:00