diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-19 14:40:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-19 14:40:48 +0400 |
| commit | 2457d4f5abd65095ae48be937ed43d026d47124a (patch) | |
| tree | 79c9b666420fa06262c90fa8f9d11ec77e285719 /source/blender/makesrna/intern/rna_object.c | |
| parent | 5c6ee6b523c6a53c310683a9f7fbe5d730db6122 (diff) | |
| parent | 90ef435145416313596cafa6f8c4c6c6aebe4e44 (diff) | |
svn merge ^/trunk/blender -r42680:42722
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 31f7f49aa80..d7a2ddd62d0 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -810,11 +810,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 */ } } |