Blender Git Loki
Git Commits -> Revision f6f7e27
Revision f6f7e27 by Sergey Sharybin (master) December 1, 2011, 12:12 (GMT) |
Slight refactor of VBO code to deal with multiple textures. Added compareDrawSettings callback to driver mesh's callbacks which are drawing textured faces (mapped and not mapped). This new callback checks if two faces are drawing with the same settings (testures, shading etc) and if they not, flush of faces happens into ogl using glDrawArrays and next face would be drawn with it's own settings. Currently implemented compareDrawSettings is used to resolve issue from bug report only, probably there are extra places where this callback is needed, but haven't seen configuration where current logic will fail, so it should be ok. Also reordered arguments passing to drawMappedFaces DM's callbacks, so now all drawing callback are accepting list of callbacks and then userData, instead of using mixed order of callbacks and userData which was a bit confusing to work with. This commit fixes: - #26410: VBO & multitexture doesnt work - #29464: VBO enabled causes UV coruption |
Commit Details:
Full Hash: f6f7e270e30946d0bb3ea4d5c556c994125e590f
SVN Revision: 42311
Parent Commit: c74f6a5
Lines Changed: +160, -84
7 Modified Paths:
/source/blender/blenkernel/BKE_DerivedMesh.h (+14, -4) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+58, -42) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+27, -9) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+24, -7) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+23, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+13, -13) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+1, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+58, -42) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+27, -9) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+24, -7) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+23, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+13, -13) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+1, -1) (Diff)