ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-26 03:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

copy/paste face textures; fixed gtk assert on linux

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@36 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-03-20 23:51:04 +00:00
parent 22294cec5c
commit fe7b2040d4
5 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,6 +1,11 @@
This is the changelog for developers, != changelog for the end user This is the changelog for developers, != changelog for the end user
that we distribute with the binaries. (see changelog) that we distribute with the binaries. (see changelog)
20/03/2006
SPoG
- Changed Copy/Paste to work on face textures if any faces are selected.
- Fixed GTK_WIDGET_REALIZED assert when selecting entities (linux).
28/02/2006 28/02/2006
namespace, SPoG namespace, SPoG
- Added drag-resizing for doom3/quake4 light_radius boxes. - Added drag-resizing for doom3/quake4 light_radius boxes.

5
radiant/brushmanip.cpp
View file

@ -1686,6 +1686,11 @@ void FaceInstance_pasteTexture(FaceInstance& faceInstance)
SceneChangeNotify(); SceneChangeNotify();
} }
bool SelectedFaces_empty()
{
return g_SelectedFaceInstances.empty();
}
void SelectedFaces_pasteTexture() void SelectedFaces_pasteTexture()
{ {
UndoableCommand command("facePasteTexture"); UndoableCommand command("facePasteTexture");

1
radiant/brushmanip.h
View file

@ -74,6 +74,7 @@ void Brush_constructMenu(GtkMenu* menu);
extern Callback g_texture_lock_status_changed; extern Callback g_texture_lock_status_changed;
bool SelectedFaces_empty();
void SelectedFaces_copyTexture(); void SelectedFaces_copyTexture();
void SelectedFaces_pasteTexture(); void SelectedFaces_pasteTexture();
void FaceTextureClipboard_setDefault(); void FaceTextureClipboard_setDefault();

10
radiant/entityinspector.cpp
View file

@ -1010,7 +1010,10 @@ void EntityClassList_selectEntityClass(EntityClass* eclass)
GtkTreeView* view = g_entityClassList; GtkTreeView* view = g_entityClassList;
GtkTreePath* path = gtk_tree_model_get_path(model, &iter); GtkTreePath* path = gtk_tree_model_get_path(model, &iter);
gtk_tree_selection_select_path(gtk_tree_view_get_selection(view), path); gtk_tree_selection_select_path(gtk_tree_view_get_selection(view), path);
gtk_tree_view_scroll_to_cell(view, path, 0, FALSE, 0, 0); if(GTK_WIDGET_REALIZED(view))
{
gtk_tree_view_scroll_to_cell(view, path, 0, FALSE, 0, 0);
}
gtk_tree_path_free(path); gtk_tree_path_free(path);
good = FALSE; good = FALSE;
} }
@ -1361,7 +1364,10 @@ static gint EntityClassList_keypress(GtkWidget* widget, GdkEventKey* event, gpoi
{ {
GtkTreePath* path = gtk_tree_model_get_path(model, &iter); GtkTreePath* path = gtk_tree_model_get_path(model, &iter);
gtk_tree_selection_select_path(gtk_tree_view_get_selection(view), path); gtk_tree_selection_select_path(gtk_tree_view_get_selection(view), path);
gtk_tree_view_scroll_to_cell(view, path, 0, FALSE, 0, 0); if(GTK_WIDGET_REALIZED(view))
{
gtk_tree_view_scroll_to_cell(view, path, 0, FALSE, 0, 0);
}
gtk_tree_path_free(path); gtk_tree_path_free(path);
count = 1; count = 1;
} }

4
radiant/mainframe.cpp
View file

@ -668,7 +668,7 @@ void Selection_Paste()
void Copy() void Copy()
{ {
if(GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive) if(SelectedFaces_empty())
{ {
Selection_Copy(); Selection_Copy();
} }
@ -680,7 +680,7 @@ void Copy()
void Paste() void Paste()
{ {
if(GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive) if(SelectedFaces_empty())
{ {
UndoableCommand undo("paste"); UndoableCommand undo("paste");