diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-18 13:36:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-18 13:36:47 +0400 |
| commit | 8ed5fdde1d0ffd11cfd0df6d1d54b768e7ac4127 (patch) | |
| tree | c28df4d913ee4e971bde2e5b4411f11a114b99e3 /source/blender/makesrna/intern/rna_object.c | |
| parent | 9c9099a805a1f143ae9916b2b6f03cbfe640bfff (diff) | |
- remove rna access to deprecated sequencer attributes x/y offset & zoom.
- Object.to_mesh was still using deprecated colbits variable (object material wouldnt work for any material after 16)
- dont set colbits when setting material slot anymore.
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 9109c8fc023..f9bb0b36a3f 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -809,11 +809,11 @@ static void rna_MaterialSlot_link_set(PointerRNA *ptr, int value) if(value) { ob->matbits[index]= 1; - ob->colbits |= (1<<index); + /* ob->colbits |= (1<<index); */ /* DEPRECATED */ } else { ob->matbits[index]= 0; - ob->colbits &= ~(1<<index); + /* ob->colbits &= ~(1<<index); */ /* DEPRECATED */ } } |