Blender Git Loki
Git Commits -> Revision 83aeba9
Revision 83aeba9 by turjuque (pbr-viewport) December 23, 2015, 22:48 (GMT) |
PRB viewport : Adding lamp support and post effects. and lots of gpu stuff. |
Commit Details:
Full Hash: 83aeba94c74781aba898e67848e13c84fbb81d0b
Parent Commit: 4aebb28
Lines Changed: +1413, -264
1 Added Path:
/source/blender/gpu/shaders/gpu_shader_fx_colormanage_frag.glsl (+118, -0) (View)
33 Modified Paths:
/.gitignore (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+2, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+13, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+26, -9) (Diff)
/source/blender/gpu/CMakeLists.txt (+2, -0) (Diff)
/source/blender/gpu/GPU_compositing.h (+5, -2) (Diff)
/source/blender/gpu/GPU_material.h (+15, -9) (Diff)
/source/blender/gpu/intern/gpu_compositing.c (+146, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+7, -6) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+9, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+202, -64) (Diff)
/source/blender/gpu/SConscript (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+616, -81) (Diff)
/source/blender/makesdna/DNA_color_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_gpu_types.h (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_color.c (+8, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+19, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_blackbody.c (+6, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c (+72, -33) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c (+73, -38) (Diff)
/source/blender/nodes/shader/nodes/node_shader_emission.c (+8, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_fresnel.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_geometry.c (+12, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_lamp.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_light_falloff.c (+10, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_lamp.c (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+3, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_wavelength.c (+7, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+2, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+13, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+26, -9) (Diff)
/source/blender/gpu/CMakeLists.txt (+2, -0) (Diff)
/source/blender/gpu/GPU_compositing.h (+5, -2) (Diff)
/source/blender/gpu/GPU_material.h (+15, -9) (Diff)
/source/blender/gpu/intern/gpu_compositing.c (+146, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+7, -6) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+9, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+202, -64) (Diff)
/source/blender/gpu/SConscript (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+616, -81) (Diff)
/source/blender/makesdna/DNA_color_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_gpu_types.h (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_color.c (+8, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+19, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_blackbody.c (+6, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c (+72, -33) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c (+73, -38) (Diff)
/source/blender/nodes/shader/nodes/node_shader_emission.c (+8, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_fresnel.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_geometry.c (+12, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_lamp.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_light_falloff.c (+10, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_lamp.c (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+3, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_wavelength.c (+7, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -1) (Diff)