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

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@85 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-06-24 17:17:33 +00:00
parent 1fd4f5bda7
commit 005e9e2db6
2 changed files with 2 additions and 3 deletions

3
TODO
View file

@ -63,7 +63,6 @@ UserDocs: how to use parent-selection:
Parent-selection works like Maya: it allows you to 'reparent' brushes 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, onto other entities than the one they're currently part of. To use it,
select some brushes, select an entity, Edit -> Parent. select some brushes, select an entity, Edit -> Parent.
Brush: enable per-face filtering
Textures: add anisotropic filtering. Textures: add anisotropic filtering.
Preferences: allow preference settings to be shared across games. Preferences: allow preference settings to be shared across games.
Preferences: add colour 'theme' files using prefs format. 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: 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: 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 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. Patch: fix insert/remove rows/cols indicated by current selected patch vertices.
Autosave/Snapshots: Add support for multi-file maps. Autosave/Snapshots: Add support for multi-file maps.
Quake2: Q2 hint transparency support Quake2: Q2 hint transparency support

View file

@ -868,7 +868,7 @@ void TextureDirectory_loadTexture(const char* directory, const char* texture)
return; return;
} }
if (!texdef_name_valid(name.c_str())) if (!shader_valid(name.c_str()))
{ {
globalOutputStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n"; globalOutputStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n";
return; return;