texture-browser: removed check for textures/ prefix when loading textures from a...

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@85 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/TODO b/TODO
index 8ff1cf8368447cece668488ee74e35c7ce1cc745..81593c2689065f7a0180dee4ef2589fc1d245a6a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -63,7 +63,6 @@ UserDocs: how to use parent-selection:
   Parent-selection works like Maya: it allows you to 'reparent' brushes
   onto other entities than the one they're currently part of. To use it,
   select some brushes, select an entity, Edit -> Parent.
-Brush: enable per-face filtering
 Textures: add anisotropic filtering.
 Preferences: allow preference settings to be shared across games.
 Preferences: add colour 'theme' files using prefs format.
@@ -119,7 +118,7 @@ Entity: add specialised attribute-entry in entity-inspector for integer/real/col
 Patch: add cap-texture, fit-texture and natural-texture toolbar buttons
 Patch: draw patches in wireframe from the back, make patches selectable from the back
 Patch: add option for convert-selection-to-new-brush/patch
-Patch: add merge-patches feature or resurrect bobtoolz
+Patch: fix bobtoolz merge-patches feature
 Patch: fix insert/remove rows/cols indicated by current selected patch vertices.
 Autosave/Snapshots: Add support for multi-file maps.
 Quake2: Q2 hint transparency support

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 23374ec8df82b37c93186a6e6a12bfee3ec825bc..d19d8710510494405c099f6b66b4fbbb9f5064b1 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -868,7 +868,7 @@ void TextureDirectory_loadTexture(const char* directory, const char* texture)
     return;
   }
 
-  if (!texdef_name_valid(name.c_str()))
+  if (!shader_valid(name.c_str()))
   {
     globalOutputStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n";
     return;