Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenkernel / intern / material.c

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index be3cc288818f31de9ce4c7c842dbaedfed68c70b..3a74252047188b004a3bcc12e2d310babaa48b96 100644 (file)
--- 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;
        }
 }