From f0e4bbd3b16d48713a8c75ae4cfc6614faa3e6be Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 16 May 2011 15:33:23 -0400 Subject: [PATCH] loading textures properly, not rendering yet --- wfobj | 2 +- wfobj-view.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wfobj b/wfobj index 1918cc8..08e5584 160000 --- a/wfobj +++ b/wfobj @@ -1 +1 @@ -Subproject commit 1918cc89bf954db83d079cfe4566a719fdc65237 +Subproject commit 08e558482f1b79ff8119c426de2ff6156fd470dc diff --git a/wfobj-view.cc b/wfobj-view.cc index 28af4aa..6056f09 100644 --- a/wfobj-view.cc +++ b/wfobj-view.cc @@ -177,7 +177,7 @@ Viewer::Viewer(const char * filename) { m_dist = 5.0; m_dragging = false; - if (!m_obj.load(filename)) + if (!m_obj.load(filename, NULL, load_texture)) { cerr << "Error loading " << filename << endl; exit(1);