Blender Git Loki
Git Commits -> Revision 3801120
Revision 3801120 by Brecht Van Lommel (apricot) July 24, 2008, 18:00 (GMT) |
Apricot Branch: GLSL ==================== * Added ObColor support, though it works different than for TexFaces. It used a new ObColor option in the materials, which will modulate the final color/alpha with the object color and alpha, also works in the render engine. * Made GLSL check the ZTransp flag. A material is now only drawn transparent if this flag is enabled, a bit more consistent with the render engine. * Fix for bug #17359: crash related subsurf + editmode GLSL. |
Commit Details:
Full Hash: 380112066998ffb002554d79ca740badacf9280b
SVN Revision: 15737
Parent Commit: 8486943
Lines Changed: +1087, -984
15 Modified Paths:
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+2, -1) (Diff)
/source/blender/gpu/GPU_material.h (+4, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+6, -2) (Diff)
/source/blender/gpu/intern/gpu_material.c (+16, -6) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+5, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+951, -949) (Diff)
/source/blender/makesdna/DNA_material_types.h (+1, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+15, -1) (Diff)
/source/blender/src/buttons_shading.c (+6, -5) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+16, -3) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.h (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+56, -12) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+4, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+2, -1) (Diff)
/source/blender/gpu/GPU_material.h (+4, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+6, -2) (Diff)
/source/blender/gpu/intern/gpu_material.c (+16, -6) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+5, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+951, -949) (Diff)
/source/blender/makesdna/DNA_material_types.h (+1, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+15, -1) (Diff)
/source/blender/src/buttons_shading.c (+6, -5) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+16, -3) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.h (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+56, -12) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+4, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021