diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-28 12:27:50 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-28 12:27:50 +0300 |
commit | f9f4e208713ec2b4fa8f8e112fb50cfd1ee6a266 (patch) | |
tree | d20c41753ed01f847e3baab635d20fdfd058e0a3 /source/blender/blenkernel/intern/material.c | |
parent | 49e7b77b1952c6ea4ab5064d0d31b54052301ffd (diff) | |
parent | 2e71927622ec7e25c400f23b58fd8d14e056482d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index be3cc288818..3a742520471 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -368,6 +368,8 @@ Material ***give_matarar_id(ID *id) return &(((Curve *)id)->mat); case ID_MB: return &(((MetaBall *)id)->mat); + default: + break; } return NULL; } @@ -384,6 +386,8 @@ short *give_totcolp_id(ID *id) return &(((Curve *)id)->totcol); case ID_MB: return &(((MetaBall *)id)->totcol); + default: + break; } return NULL; } @@ -403,6 +407,8 @@ static void material_data_index_remove_id(ID *id, short index) case ID_MB: /* meta-elems don't have materials atm */ break; + default: + break; } } @@ -421,6 +427,8 @@ static void material_data_index_clear_id(ID *id) case ID_MB: /* meta-elems don't have materials atm */ break; + default: + break; } } |