sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugix #3200

Browse Source 
DAG_object_flush_update() always used scene layers, causing updates to go
wrong with 3d windows with "Lock" off (allowing local layer and camera).

This fixes a larger amount of potential issues.

Also: fixed menu title for adding IK constraint to Bone (CTRL+I).
This commit is contained in:
Ton Roosendaal 2005-10-24 19:13:15 +00:00
parent a021181b5b
commit 050dcad59c
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/intern/depsgraph.c
View File

@ -59,6 +59,7 @@
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "DNA_view2d_types.h"
#include "DNA_view3d_types.h"
#include "BKE_action.h"
#include "BKE_global.h"
@ -1532,6 +1533,23 @@ void DAG_scene_update_flags(Scene *sce, unsigned int lay)
DAG_scene_flush_update(sce, lay);
}
/* for depgraph updating, all layers visible in a screen */
/* this is a copy from editscreen.c... I need to think over a more proper solution for this */
/* probably the DAG_object_flush_update() should give layer too? */
/* or some kind of dag context... (DAG_set_layer) */
static unsigned int dag_screen_view3d_layers(void)
{
ScrArea *sa;
int layer= 0;
for(sa= G.curscreen->areabase.first; sa; sa= sa->next) {
if(sa->spacetype==SPACE_VIEW3D)
layer |= ((View3D *)sa->spacedata.first)->lay;
}
return layer;
}
/* flag this object and all its relations to recalc */
/* if you need to do more objects, tag object yourself and
use DAG_scene_flush_update() in end */
@ -1561,7 +1579,10 @@ void DAG_object_flush_update(Scene *sce, Object *ob, short flag)
}
}
DAG_scene_flush_update(sce, sce->lay);
if(G.curscreen)
DAG_scene_flush_update(sce, dag_screen_view3d_layers());
else
DAG_scene_flush_update(sce, sce->lay);
}
/* recursively descends tree, each node only checked once */

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

@ -618,7 +618,7 @@ void add_constraint(int only_IK)
}
if(pchansel)
nr= pupmenu("Add IK Constraint%t|To New Empty Object%x10");
nr= pupmenu("Add IK Constraint%t|To Selected Bone");
else if(obsel)
nr= pupmenu("Add IK Constraint%t|To Selected Object%x10");
else