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

Further fix for bug #8124: now depsgraph relation was added correct,

Browse Source 
but depsgraph didn't get updated immediately yet.
This commit is contained in:
Brecht Van Lommel 2008-01-30 15:28:31 +00:00
parent b9309909fb
commit 6601cef1d0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/include/butspace.h
View File

@ -773,6 +773,7 @@ enum {
#define B_PART_ENABLE 3437 #define B_PART_ENABLE 3437
#define B_OFSTIMEOFS 3438 /* see B_AUTOTIMEOFS too */ #define B_OFSTIMEOFS 3438 /* see B_AUTOTIMEOFS too */
#define B_RANDTIMEOFS 3439 #define B_RANDTIMEOFS 3439
#define B_PART_REDRAW_DEPS 3440
#define B_MODIFIER_BUTS 3600 #define B_MODIFIER_BUTS 3600

8
source/blender/src/buttons_object.c
View File

@ -3092,6 +3092,10 @@ void do_effects_panels(unsigned short event)
allqueue(REDRAWOOPS, 0); allqueue(REDRAWOOPS, 0);
} }
/* no break! */ /* no break! */
case B_PART_REDRAW_DEPS:
if(event == B_PART_REDRAW_DEPS)
DAG_scene_sort(G.scene);
/* no break! */
case B_PART_REDRAW: case B_PART_REDRAW:
nr=0; nr=0;
for(psys=ob->particlesystem.first; psys; psys=psys->next){ for(psys=ob->particlesystem.first; psys; psys=psys->next){
@ -4253,10 +4257,10 @@ static void object_panel_particle_visual(Object *ob)
switch(part->draw_as) { switch(part->draw_as) {
case PART_DRAW_OB: case PART_DRAW_OB:
uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_PART_REDRAW, "OB:", butx,(buty-=buth),butw,buth, &part->dup_ob, "Show this Object in place of particles"); uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_PART_REDRAW_DEPS, "OB:", butx,(buty-=buth),butw,buth, &part->dup_ob, "Show this Object in place of particles");
break; break;
case PART_DRAW_GR: case PART_DRAW_GR:
uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_PART_REDRAW, "GR:", butx,(buty-=buth),butw,buth, &part->dup_group, "Show Objects in this Group in place of particles"); uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_PART_REDRAW_DEPS, "GR:", butx,(buty-=buth),butw,buth, &part->dup_group, "Show Objects in this Group in place of particles");
uiDefButBitS(block, TOG, PART_DRAW_WHOLE_GR, B_PART_REDRAW, "Dupli Group", butx,(buty-=buth),butw,buth, &part->draw, 0, 0, 0, 0, "Use whole group at once"); uiDefButBitS(block, TOG, PART_DRAW_WHOLE_GR, B_PART_REDRAW, "Dupli Group", butx,(buty-=buth),butw,buth, &part->draw, 0, 0, 0, 0, "Use whole group at once");
if((part->draw & PART_DRAW_WHOLE_GR)==0) if((part->draw & PART_DRAW_WHOLE_GR)==0)
uiDefButBitS(block, TOG, PART_DRAW_RAND_GR, B_PART_REDRAW, "Pick Random", butx,(buty-=buth),butw,buth, &part->draw, 0, 0, 0, 0, "Pick objects from group randomly"); uiDefButBitS(block, TOG, PART_DRAW_RAND_GR, B_PART_REDRAW, "Pick Random", butx,(buty-=buth),butw,buth, &part->draw, 0, 0, 0, 0, "Pick objects from group randomly");