Fixes in commit for Group Proxy feature;

- Groups with hidden parts didn't render OK
- Layer buttons sent out wrong events

2 files changed, 26 insertions, 23 deletions

diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 3e104a2e623..1fdbfab4642 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -1788,16 +1788,16 @@ static void object_panel_object(Object *ob)
 			/* layers */
 			uiBlockBeginAlign(block);
 			for(a=0; a<5; a++)
-				uiDefButBitI(block, TOG, 1<<a, B_REDR+a, "",	(short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
+				uiDefButBitI(block, TOG, 1<<a, REDRAWVIEW3D, "",	(short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
 			for(a=0; a<5; a++)
-				uiDefButBitI(block, TOG, 1<<(a+10), B_REDR+a+10, "",	(short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
+				uiDefButBitI(block, TOG, 1<<(a+10), REDRAWVIEW3D, "",	(short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
 			
 			xco+= 7;
 			uiBlockBeginAlign(block);
 			for(a=5; a<10; a++)
-				uiDefButBitI(block, TOG, 1<<a, B_REDR+a, "",	(short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
+				uiDefButBitI(block, TOG, 1<<a, REDRAWVIEW3D, "",	(short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
 			for(a=5; a<10; a++)
-				uiDefButBitI(block, TOG, 1<<(a+10), B_REDR+a+10, "",	(short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
+				uiDefButBitI(block, TOG, 1<<(a+10), REDRAWVIEW3D, "",	(short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, "");
 			
 			uiBlockEndAlign(block);
 			
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 6d760bf29be..ee7b462f1da 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -2645,25 +2645,28 @@ static void draw_dupli_objects(View3D *v3d, Base *base)
 	lb= object_duplilist(G.scene, base->object);
 
 	for(dob= lb->first; dob; dob= dob->next) {
-		tbase.object= dob->ob;
-		
-		Mat4CpyMat4(dob->ob->obmat, dob->mat);
-		
-		/* extra service: draw the duplicator in drawtype of parent */
-		dt= tbase.object->dt; tbase.object->dt= base->object->dt;
-		dtx= tbase.object->dtx; tbase.object->dtx= base->object->dtx;
-		
-		/* negative scale flag has to propagate */
-		transflag= tbase.object->transflag;
-		if(base->object->transflag & OB_NEG_SCALE)
-			tbase.object->transflag ^= OB_NEG_SCALE;
-		
-		BIF_ThemeColorBlend(color, TH_BACK, 0.5);
-		draw_object(&tbase, DRAW_CONSTCOLOR);
-		
-		tbase.object->dt= dt;
-		tbase.object->dtx= dtx;
-		tbase.object->transflag= transflag;
+		if(dob->no_draw);
+		else {
+			tbase.object= dob->ob;
+			
+			Mat4CpyMat4(dob->ob->obmat, dob->mat);
+			
+			/* extra service: draw the duplicator in drawtype of parent */
+			dt= tbase.object->dt; tbase.object->dt= base->object->dt;
+			dtx= tbase.object->dtx; tbase.object->dtx= base->object->dtx;
+			
+			/* negative scale flag has to propagate */
+			transflag= tbase.object->transflag;
+			if(base->object->transflag & OB_NEG_SCALE)
+				tbase.object->transflag ^= OB_NEG_SCALE;
+			
+			BIF_ThemeColorBlend(color, TH_BACK, 0.5);
+			draw_object(&tbase, DRAW_CONSTCOLOR);
+			
+			tbase.object->dt= dt;
+			tbase.object->dtx= dtx;
+			tbase.object->transflag= transflag;
+		}
 	}
 	
 	/* Transp afterdraw disabled, afterdraw only stores base pointers, and duplis can be same obj */