Blender Git Loki

Git Commits -> Revision 9a7fe52

Revision 9a7fe52 by Jason Wilkins (soc-2010-jwilkins)
May 27, 2011, 11:02 (GMT)
Merge Cleanup.
Second attempt to make sure branch is a copy of trunk revision 36905. Just missed a few files.

Commit Details:

Full Hash: 9a7fe52124d5563b729610bf35b9548d4332f2c6
SVN Revision: 36948
Parent Commit: 3013006
Lines Changed: +929, -6644

18 Deleted Paths:

/extern/make/msvc_7_0/build_install_all.vcproj (+0, -85)
/extern/make/msvc_7_0/extern.sln (+0, -245)
/extern/make/msvc_9_0/build_install_all.vcproj (+0, -114)
/intern/audaspace/make/msvc_9_0/audaspace.vcproj (+0, -924)
/release/scripts/modules/rigify_utils.py (+0, -467)
/source/blender/blenlib/intern/BLI_bfile.c (+0, -372)
/source/blender/editors/space_console/console_report.c (+0, -404)
/source/blender/editors/space_file/writeimage.c (+0, -233)
/source/blender/imbuf/intern/anim.c (+0, -1188)
/source/tests/batch_import.py (+0, -202)
/source/tests/bl_load_addons.py (+0, -78)
/source/tests/bl_load_py_modules.py (+0, -145)
/source/tests/bl_run_operators.py (+0, -176)
/source/tests/bl_test.py (+0, -197)
/source/tests/CMakeLists.txt (+0, -293)
/source/tests/pep8.py (+0, -118)
/source/tests/rna_array.py (+0, -297)
/source/tests/rna_info_dump.py (+0, -131)

31 Modified Paths:

/build_files/scons/tools/Blender.py (+537, -526) (Diff)
/extern/glew/src/glew.c (+16, -16) (Diff)
/extern/SConscript (+2, -2) (Diff)
/release/bin/blender-thumbnailer.py (+8, -8) (Diff)
/release/windows/installer/00.sconsblender.nsi (+12, -8) (Diff)
/source/blender/blenkernel/BKE_brush.h (+1, -3) (Diff)
/source/blender/blenkernel/BKE_paint.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/brush.c (+45, -39) (Diff)
/source/blender/blenkernel/intern/colortools.c (+7, -6) (Diff)
/source/blender/blenkernel/intern/icons.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+62, -77) (Diff)
/source/blender/blenkernel/intern/material.c (+44, -41) (Diff)
/source/blender/blenkernel/intern/paint.c (+6, -6) (Diff)
/source/blender/blenlib/intern/pbvh.c (+67, -66) (Diff)
/source/blender/blenloader/intern/readfile.c (+17, -22) (Diff)
/source/blender/editors/sculpt_paint/sculpt_intern.h (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+5, -5) (Diff)
/source/blender/gpu/intern/gpu_material.c (+10, -10) (Diff)
/source/blender/ikplugin/CMakeLists.txt (+17, -65) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+4, -4) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+5, -5) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+4, -4) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+1, -3) (Diff)
/source/blender/makesrna/intern/rna_space.c (+33, -35) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+13, -13) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -2) (Diff)
/source/blender/modifiers/SConscript (+5, -1) (Diff)
/source/CMakeLists.txt (+0, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021