[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13479] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13479
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13479
Author:   blendix
Date:     2008-01-30 16:28:31 +0100 (Wed, 30 Jan 2008)

Log Message:
-----------

Further fix for bug #8124: now depsgraph relation was added correct,
but depsgraph didn't get updated immediately yet.

Modified Paths:
--------------
    trunk/blender/source/blender/include/butspace.h
    trunk/blender/source/blender/src/buttons_object.c

Modified: trunk/blender/source/blender/include/butspace.h
===================================================================
--- trunk/blender/source/blender/include/butspace.h	2008-01-30 14:25:36 UTC (rev 13478)
+++ trunk/blender/source/blender/include/butspace.h	2008-01-30 15:28:31 UTC (rev 13479)
@@ -773,6 +773,7 @@
 #define B_PART_ENABLE		3437
 #define B_OFSTIMEOFS		3438 /* see B_AUTOTIMEOFS too */
 #define B_RANDTIMEOFS		3439
+#define B_PART_REDRAW_DEPS	3440
 
 #define B_MODIFIER_BUTS		3600
 

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-01-30 14:25:36 UTC (rev 13478)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-01-30 15:28:31 UTC (rev 13479)
@@ -3092,6 +3092,10 @@
 			allqueue(REDRAWOOPS, 0);
 		}
 		/* no break! */
+	case B_PART_REDRAW_DEPS:
+		if(event == B_PART_REDRAW_DEPS)
+			DAG_scene_sort(G.scene);
+		/* no break! */
 	case B_PART_REDRAW:
 		nr=0;
 		for(psys=ob->particlesystem.first; psys; psys=psys->next){
@@ -4253,10 +4257,10 @@
 
 	switch(part->draw_as) {
 		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;
 		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");
 			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");