archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	intern/cycles/blender/addon/ui.py
This commit is contained in:
Tamito Kajiyama
2018-02-09 03:00:20 +09:00
parent 74fa84f37f 859379ac48
commit 3b61d2bb68
16 changed files with 177 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/python/CMakeLists.txt
View File

@@ -547,6 +547,7 @@ if(WITH_CYCLES)
add_cycles_render_test(shader)
add_cycles_render_test(shader_tangent)
add_cycles_render_test(shadow_catcher)
add_cycles_render_test(sss)
add_cycles_render_test(texture_space)
add_cycles_render_test(volume)
else()