Blender Git Loki
Git Commits -> Revision 26ef6da
Revision 26ef6da by Brecht Van Lommel (master) July 13, 2009, 00:40 (GMT) |
2.5 * Objects now support up to 32767 material slots. It's easy to increase this further, but I prefer not to increase the memory usage of mesh faces, it seems unlikely that someone would create 32767 distinct materials? * Forward compatibility: the only thing you can potentially lose reading a 2.5 file in 2.4 is object linking (instead of default data), though usually that will go fine too. Reading files with > 32 material slots in 2.4 can start giving issues. * The ob->colbits variable is deprecated by the array ob->matbits but I didn't remove the ob->colbits updates in very few places it is set. * I hope I changed all the relevant things, various places just hardcoded the number 16 instead of using the MAXMAT define. * Join Objects operator back. This is using the version from the animsys2 branch coded by Joshua, which means it now supports joining of shape keys. * Fix for crash reading file saved during render. |
Commit Details:
Full Hash: 26ef6da24b3324fb6f8ab6cfe12f101f0d7dedb4
SVN Revision: 21553
Parent Commit: 6fb0181
Lines Changed: +685, -441
31 Modified Paths:
/release/ui/buttons_material.py (+2, -2) (Diff)
/source/blender/blenkernel/intern/exotic.c (+9, -10) (Diff)
/source/blender/blenkernel/intern/material.c (+36, -16) (Diff)
/source/blender/blenkernel/intern/object.c (+6, -1) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_editVert.h (+2, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+10, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -0) (Diff)
/source/blender/editors/armature/editarmature.c (+72, -75) (Diff)
/source/blender/editors/curve/editcurve.c (+35, -50) (Diff)
/source/blender/editors/include/ED_armature.h (+2, -0) (Diff)
/source/blender/editors/include/ED_curve.h (+3, -0) (Diff)
/source/blender/editors/include/ED_mesh.h (+3, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh.c (+7, -7) (Diff)
/source/blender/editors/mesh/meshtools.c (+330, -199) (Diff)
/source/blender/editors/object/object_edit.c (+47, -1) (Diff)
/source/blender/editors/object/object_intern.h (+1, -0) (Diff)
/source/blender/editors/object/object_ops.c (+2, -0) (Diff)
/source/blender/editors/space_image/image_ops.c (+0, -2) (Diff)
/source/blender/editors/space_outliner/outliner.c (+6, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+21, -17) (Diff)
/source/blender/gpu/GPU_draw.h (+3, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+38, -14) (Diff)
/source/blender/makesdna/DNA_material_types.h (+4, -4) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+4, -3) (Diff)
/source/blender/makesdna/DNA_object_types.h (+8, -6) (Diff)
/source/blender/makesrna/intern/rna_curve.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+8, -4) (Diff)
/source/blender/render/intern/source/convertblender.c (+23, -21) (Diff)
/source/blender/blenkernel/intern/exotic.c (+9, -10) (Diff)
/source/blender/blenkernel/intern/material.c (+36, -16) (Diff)
/source/blender/blenkernel/intern/object.c (+6, -1) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_editVert.h (+2, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+10, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -0) (Diff)
/source/blender/editors/armature/editarmature.c (+72, -75) (Diff)
/source/blender/editors/curve/editcurve.c (+35, -50) (Diff)
/source/blender/editors/include/ED_armature.h (+2, -0) (Diff)
/source/blender/editors/include/ED_curve.h (+3, -0) (Diff)
/source/blender/editors/include/ED_mesh.h (+3, -0) (Diff)
/source/blender/editors/include/ED_transform.h (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh.c (+7, -7) (Diff)
/source/blender/editors/mesh/meshtools.c (+330, -199) (Diff)
/source/blender/editors/object/object_edit.c (+47, -1) (Diff)
/source/blender/editors/object/object_intern.h (+1, -0) (Diff)
/source/blender/editors/object/object_ops.c (+2, -0) (Diff)
/source/blender/editors/space_image/image_ops.c (+0, -2) (Diff)
/source/blender/editors/space_outliner/outliner.c (+6, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+21, -17) (Diff)
/source/blender/gpu/GPU_draw.h (+3, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+38, -14) (Diff)
/source/blender/makesdna/DNA_material_types.h (+4, -4) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+4, -3) (Diff)
/source/blender/makesdna/DNA_object_types.h (+8, -6) (Diff)
/source/blender/makesrna/intern/rna_curve.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+8, -4) (Diff)
/source/blender/render/intern/source/convertblender.c (+23, -21) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021