archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 32886.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-11-05 21:49:36 +00:00
parent aa7575c008 e8501edae2
commit 43f4dbceb4
552 changed files with 14432 additions and 21005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/blender/editors/render/render_shading.c
View File

@@ -403,36 +403,38 @@ static int material_slot_de_select(bContext *C, int select)
BezTriple *bezt;
int a;
for(nu= nurbs->first; nu; nu=nu->next) {
if(nu->mat_nr==ob->actcol-1) {
if(nu->bezt) {
a= nu->pntsu;
bezt= nu->bezt;
while(a--) {
if(bezt->hide==0) {
if(select) {
bezt->f1 |= SELECT;
bezt->f2 |= SELECT;
bezt->f3 |= SELECT;
}
else {
bezt->f1 &= ~SELECT;
bezt->f2 &= ~SELECT;
bezt->f3 &= ~SELECT;
if(nurbs) {
for(nu= nurbs->first; nu; nu=nu->next) {
if(nu->mat_nr==ob->actcol-1) {
if(nu->bezt) {
a= nu->pntsu;
bezt= nu->bezt;
while(a--) {
if(bezt->hide==0) {
if(select) {
bezt->f1 |= SELECT;
bezt->f2 |= SELECT;
bezt->f3 |= SELECT;
}
else {
bezt->f1 &= ~SELECT;
bezt->f2 &= ~SELECT;
bezt->f3 &= ~SELECT;
}
}
bezt++;
}
bezt++;
}
}
else if(nu->bp) {
a= nu->pntsu*nu->pntsv;
bp= nu->bp;
while(a--) {
if(bp->hide==0) {
if(select) bp->f1 |= SELECT;
else bp->f1 &= ~SELECT;
else if(nu->bp) {
a= nu->pntsu*nu->pntsv;
bp= nu->bp;
while(a--) {
if(bp->hide==0) {
if(select) bp->f1 |= SELECT;
else bp->f1 &= ~SELECT;
}
bp++;
}
bp++;
}
}
}