Blender Git Loki
Git Commits -> Revision b818016
Revision b818016 by Brecht Van Lommel (apricot) July 29, 2008, 16:25 (GMT) |
Apricot Branch ============== svn merge -r15866:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender Alpha blending and sorting changes, but also include some initial support for GLSL lamps in dupligroups (only one duplicate works at the moment). |
Commit Details:
Full Hash: b818016d77d4669cb45a57666286c2e60d8d062a
SVN Revision: 15868
Parent Commit: c235327
Lines Changed: +1567, -1766
2 Deleted Paths:
/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp (+0, -114)
/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h (+0, -99)
/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h (+0, -99)
30 Modified Paths:
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+52, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+29, -1) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+6, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+985, -980) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+1, -1) (Diff)
/source/blender/src/buttons_editing.c (+1, -0) (Diff)
/source/blender/src/drawview.c (+46, -25) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp (+0, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+239, -254) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/BL_Material.h (+2, -3) (Diff)
/source/gameengine/Ketsji/BL_Texture.cpp (+0, -3) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+22, -66) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+0, -3) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_PolygonMaterial.cpp (+4, -4) (Diff)
/source/gameengine/Ketsji/KX_PolygonMaterial.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+6, -10) (Diff)
/source/gameengine/Rasterizer/RAS_BucketManager.cpp (+1, -15) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp (+5, -5) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h (+4, -4) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+4, -6) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp (+7, -17) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.h (+2, -5) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+91, -95) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+13, -16) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+37, -12) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+5, -4) (Diff)
/source/gameengine/Rasterizer/RAS_Polygon.cpp (+0, -18) (Diff)
/source/blender/blenloader/intern/readfile.c (+52, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+29, -1) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+6, -0) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+985, -980) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+1, -1) (Diff)
/source/blender/src/buttons_editing.c (+1, -0) (Diff)
/source/blender/src/drawview.c (+46, -25) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp (+0, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+239, -254) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/BL_Material.h (+2, -3) (Diff)
/source/gameengine/Ketsji/BL_Texture.cpp (+0, -3) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+22, -66) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+0, -3) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+2, -1) (Diff)
/source/gameengine/Ketsji/KX_PolygonMaterial.cpp (+4, -4) (Diff)
/source/gameengine/Ketsji/KX_PolygonMaterial.h (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+6, -10) (Diff)
/source/gameengine/Rasterizer/RAS_BucketManager.cpp (+1, -15) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp (+5, -5) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h (+4, -4) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+4, -6) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp (+7, -17) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.h (+2, -5) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+91, -95) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+13, -16) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+37, -12) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+5, -4) (Diff)
/source/gameengine/Rasterizer/RAS_Polygon.cpp (+0, -18) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021