Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-11-21 16:25:54 +0300
committerTon Roosendaal <ton@blender.org>2004-11-21 16:25:54 +0300
commit7d7acbf6bd6cc35d6b14d825e405dd5232e18f4a (patch)
treeefda775a08ea659c6be2280cc18ca93972671687 /source/blender/src/header_filesel.c
parent9b9f9fc0385939e939202ab976dacb4678c62b6c (diff)
Bug #1865
On appending in posemoding, Blender could crash. Found out the new 'select appended' also sets the 'active base/object'. This isn't OK on that level of the code, 'active' exists (and needs to be set) on UI code level in src/, not in the middle of file reading function. Also removed weird negative bitflag that enforced 'select appended' to be default. If you want that, set the flag itself in do_versions or so. In my opinion it is best saved in .B.blend instead. Another time...
Diffstat (limited to 'source/blender/src/header_filesel.c')
-rw-r--r--source/blender/src/header_filesel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/header_filesel.c b/source/blender/src/header_filesel.c
index 663c0c9bbb0..42f3b931ecf 100644
--- a/source/blender/src/header_filesel.c
+++ b/source/blender/src/header_filesel.c
@@ -149,11 +149,11 @@ void file_buttons(void)
uiDefButS(block, TOG|BIT|2, B_REDR, "Link", xco+=100,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Creates a link to selected data from current project");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
- uiDefButS(block, TOGN|BIT|4, B_REDR, "Autosel", xco+=125,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects");
+ uiDefButS(block, TOG|BIT|4, B_REDR, "Autosel", xco+=125,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Autoselect imported objects");
uiDefButS(block, TOG|BIT|5, B_REDR, "Active Layer", xco+=65,0,80,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) in active layer");
uiDefButS(block, TOG|BIT|6, B_REDR, "At Cursor", xco+=80,0,65,YIC, &sfile->flag, 0, 0, 0, 0, "Append object(s) at cursor, use centroid if more than one object is selected");
uiBlockEndAlign(block);
- } else {
+ } else if(sfile->type==FILE_BLENDER) {
uiDefButI(block, TOGN|BIT|10, B_REDR, "Load UI", xco+=XIC,0,80,YIC, &G.fileflags, 0, 0, 0, 0, "Load the UI setup as well as the scene data");
xco+=100;
}