archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- fixed bug that printed: "bad call to addqueue: 0 (18, 1)" when using

Browse Source 
layer buttons or the layer hotkeys 1-2-3-etc.

  was caused in space.c, view3dlock, untested call to addqueue.
This commit is contained in:
Ton Roosendaal
2003-07-04 20:15:13 +00:00
parent 19ac604c47
commit 20df091c04
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/src/headerbuttons.c
View File

@@ -190,7 +190,6 @@ void do_image_buttons(unsigned short event);
void do_imasel_buttons(short event); void do_imasel_buttons(short event);
static void check_packAll(void); static void check_packAll(void);
static void unique_bone_name(Bone *bone, bArmature *arm); static void unique_bone_name(Bone *bone, bArmature *arm);
static void validate_bonebutton(void *data1, void *data2);
static int bonename_exists(Bone *orig, char *name, ListBase *list); static int bonename_exists(Bone *orig, char *name, ListBase *list);
static void test_idbutton_cb(void *namev, void *arg2_unused) static void test_idbutton_cb(void *namev, void *arg2_unused)
@@ -1657,10 +1656,9 @@ void do_global_buttons2(short event)
} }
break; break;
case B_ACTALONE: case B_ACTALONE:
if (ob) if(ob && ob->id.lib==0) {
act= ob->action; act= ob->action;
if(ob && ob->id.lib==0) {
if(act->id.us>1) { if(act->id.us>1) {
if(okee("Single user")) { if(okee("Single user")) {
ob->action=copy_action(act); ob->action=copy_action(act);
@@ -3906,7 +3904,7 @@ void do_view3d_buttons(short event)
} }
scrarea_queue_winredraw(curarea); scrarea_queue_winredraw(curarea);
countall(); countall();
if(G.vd->scenelock) handle_view3d_lock(); if(G.vd->scenelock) handle_view3d_lock();
allqueue(REDRAWOOPS, 0); allqueue(REDRAWOOPS, 0);
} }
@@ -4661,6 +4659,7 @@ void buttons_active_id(ID **id, ID **idfrom)
} }
} }
#if 0
static void validate_bonebutton(void *bonev, void *data2_unused){ static void validate_bonebutton(void *bonev, void *data2_unused){
Bone *bone= bonev; Bone *bone= bonev;
bArmature *arm; bArmature *arm;
@@ -4668,7 +4667,7 @@ static void validate_bonebutton(void *bonev, void *data2_unused){
arm = get_armature(G.obpose); arm = get_armature(G.obpose);
unique_bone_name(bone, arm); unique_bone_name(bone, arm);
} }
#endif
static int bonename_exists(Bone *orig, char *name, ListBase *list) static int bonename_exists(Bone *orig, char *name, ListBase *list)
{ {

2
source/blender/src/space.c
View File

@@ -199,7 +199,7 @@ void copy_view3d_lock(short val)
} }
if(val==REDRAW && vd==sa->spacedata.first) { if(val==REDRAW && vd==sa->spacedata.first) {
scrarea_queue_redraw(sa); if(sa->win) scrarea_queue_redraw(sa);
} }
} }
} }