Merge with 2.5 -r 21515:21619.
[blender-staging.git] / source / blender / render /
drwxr-xr-x   ..
-rw-r--r-- 1731 CMakeLists.txt
-rw-r--r-- 1065 Makefile
-rw-r--r-- 721 SConscript
drwxr-xr-x - extern
drwxr-xr-x - intern