[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30279] branches/render25/source/blender/ blenkernel/intern/scene.c: remove temp hack, recent merge fixed this.

[Campbell Barton]

Revision: 30279
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30279
Author:   campbellbarton
Date:     2010-07-13 19:45:57 +0200 (Tue, 13 Jul 2010)

Log Message:
-----------
remove temp hack, recent merge fixed this.

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/scene.c

Modified: branches/render25/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/scene.c	2010-07-13 17:11:50 UTC (rev 30278)
+++ branches/render25/source/blender/blenkernel/intern/scene.c	2010-07-13 17:45:57 UTC (rev 30279)
@@ -664,7 +664,7 @@
 			if(*base == NULL) fase= F_START;
 			else {
 				if(fase!=F_DUPLI) {
-					if( (*base)->object->transflag & OB_DUPLI			&& 0 /* XXX, Quick Durian Hack, will try fix but now, DONT MERGE THIS */) {
+					if( (*base)->object->transflag & OB_DUPLI) {
 						/* groups cannot be duplicated for mballs yet, 
 						this enters eternal loop because of 
 						makeDispListMBall getting called inside of group_duplilist */