Merge branch 'master' into blender2.8

2017-08-28 11:27:50 +02:00
parent 49e7b77b19 2e71927622
commit f9f4e20871
23 changed files with 62 additions and 4 deletions
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -1785,6 +1785,8 @@ static void copy_mtex_copybuf(ID *id)
 		case ID_LS:
 			mtex = &(((FreestyleLineStyle *)id)->mtex[(int)((FreestyleLineStyle *)id)->texact]);
 			break;
+		default:
+			break;
 	}
 	
 	if (mtex && *mtex) {