Parse custom shader data from json

armory3d · Jan 23, 2018 · af247f1 · af247f1
1 parent 8ecea46
commit af247f1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/blender/arm/material/make.py b/blender/arm/material/make.py
@@ -121,6 +121,10 @@ def parse(material, mat_data, mat_users, mat_armusers):
             const['bool'] = material.arm_receive_shadow
             c['bind_constants'].append(const)
 
-    mat_data['shader'] = shader_data_name + '/' + shader_data_name
+    shader_file_name = shader_data_name
+    if material.arm_custom_material != '':
+        shader_file_name += '.json'
+
+    mat_data['shader'] = shader_file_name + '/' + shader_data_name
 
     return sd, rpasses