[Bf-committers] button patch

[Roel Spruit]

This is a multi-part message in MIME format.

------=_NextPart_000_0000_01C35EBE.F774F3E0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

well, I was wandering around in this code anyway:

fixed:

- Buttonwindow no longer changes to materialbuttons upon selecting a CAMERA.
(should it change to the editbuttons instead?)
- Draw bounds buttons in editbuttons are no longer shown for lamps or
camera's, they didn't have any effect. also removed "Wire", "TextSpace"
etc...
Diff file is included

On another subject, in the tracker I found this bug:
http://projects.blender.org/tracker/index.php?func=detail&aid=410&group_id=9
&atid=125
this problem should be solved with jiri's patch for metaballs right?

Roel

------=_NextPart_000_0000_01C35EBE.F774F3E0
Content-Type: application/octet-stream;
	name="buttons.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="buttons.patch"

Index: source/blender/src/buttons.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons.c,v
retrieving revision 1.31
diff -r1.31 buttons.c
1023a1024
> 	if((ob->type!=3DOB_CAMERA) && (ob->type!=3DOB_LAMP)){
1030,1031c1031
< 	uiDefButS(block, MENU, REDRAWVIEW3D, "Bounding =
volume%t|Box%x0|Sphere%x1|Cylinder%x2|Cone%x3|Polyheder",
< 																28, 120, 100, 18, &ob->boundtype, 0, 0, 0, 0, "Choose =
between bound objects");
---
> 	uiDefButS(block, MENU, REDRAWVIEW3D, "Bounding =
volume%t|Box%x0|Sphere%x1|Cylinder%x2|Cone%x3|Polyheder", 28, 120, 100, =
18, &ob->boundtype, 0, 0, 0, 0, "Choose between bound objects");
1034c1034
< 	uiDefButC(block, TOG|BIT|2, REDRAWVIEW3D, "TexSpace",	28, 60, 100, =
18, &ob->dtx, 0, 0, 0, 0, "Display texture space");
---
> 	uiDefButC(block, TOG|BIT|2, REDRAWVIEW3D, "TexSpace",		28, 60, 100, =
18, &ob->dtx, 0, 0, 0, 0, "Display texture space");
1035a1036,1047
> 	}
> 	else if(ob->type=3D=3DOB_LAMP){	=09
> 		uiDefBut(block, LABEL, 0, "Draw Extra",			28, 160,100,18, 0, 0, 0, =
0, 0, "");
> 		uiDefButC(block, TOG|BIT|3, REDRAWVIEW3D, "Name",	28, 140, 100, 18, =
&ob->dtx, 0, 0, 0, 0, "Print object name");
> 	}
> 	else if(ob->type=3D=3DOB_CAMERA){
> 		uiDefBut(block, LABEL, 0, "Draw Extra",			28, 160,100,18, 0, 0, 0, =
0, 0, "");
> 		uiDefButC(block, TOG|BIT|1, REDRAWVIEW3D, "Axis",	28, 140, 100, 18, =
&ob->dtx, 0, 0, 0, 0, "Draw axis");
> 		uiDefButC(block, TOG|BIT|3, REDRAWVIEW3D, "Name",	28, 120, 100, 18, =
&ob->dtx, 0, 0, 0, 0, "Print object name");
> 	}
> =09
> =09
7468c7480
< 				if(new && new->object->type!=3DOB_LAMP) {
---
> 				if(new && ((new->object->type!=3DOB_LAMP) && =
(new->object->type!=3DOB_CAMERA))) {
7470c7482
< 					allqueue(REDRAWBUTSMAT, 0);
---
> 					allqueue(REDRAWBUTSMAT, 0);	
------=_NextPart_000_0000_01C35EBE.F774F3E0--