[tuhopuu-cvs] CVS commit: tuhopuu2 Makefile Makefile.am configure.ac tuhopuu2/bin/.blender .Blanguages tuhopuu2/extern/solid Makefile.in aclocal.m4 configure tuhopuu2/extern/solid/doc Makefile.in stamp-vti version.texi tuhopuu2/extern/solid/examples ...
Chris Want
cwant at ualberta.ca
Sun Feb 15 06:53:40 CET 2004
hos (Chris Want) 2004/02/15 06:53:40 CET
Modified files:
. Makefile Makefile.am configure.ac
tuhopuu2/bin/.blender .Blanguages
tuhopuu2/intern/ghost/intern GHOST_C-api.cpp GHOST_Window.cpp
GHOST_WindowWin32.cpp
tuhopuu2/projectfiles/blender blender.dsw
tuhopuu2/projectfiles/blender/src BL_src.dsp
tuhopuu2/release Makefile
tuhopuu2/source Makefile nan_compile.mk nan_link.mk
tuhopuu2/source/blender Makefile.am
tuhopuu2/source/blender/blenkernel BKE_action.h BKE_effect.h
BKE_global.h
tuhopuu2/source/blender/blenkernel/intern action.c armature.c
blender.c
constraint.c
displist.c effect.c
exotic.c library.c
mball.c object.c
scene.c subsurf.c
text.c texture.c
world.c
tuhopuu2/source/blender/blenlib BLI_arithb.h
tuhopuu2/source/blender/blenlib/intern arithb.c freetypefont.c
tuhopuu2/source/blender/blenloader/intern readfile.c
writefile.c
tuhopuu2/source/blender/ftfont/intern FTF_TTFont.cpp
tuhopuu2/source/blender/include BDR_editobject.h
BIF_editarmature.h
BIF_editmesh.h BIF_interface.h
BIF_resources.h BIF_space.h
BSE_editipo.h
BSE_headerbuttons.h blendef.h
butspace.h interface.h
mydevice.h
tuhopuu2/source/blender/makesdna DNA_armature_types.h
DNA_material_types.h
DNA_mesh_types.h
DNA_scene_types.h
DNA_screen_types.h
DNA_texture_types.h
DNA_userdef_types.h
DNA_view3d_types.h
DNA_world_types.h
tuhopuu2/source/blender/makesdna/intern makesdna.c
tuhopuu2/source/blender/render/extern/include render_types.h
tuhopuu2/source/blender/render/intern/source initrender.c
pixelblending.c
rendercore.c
renderdatabase.c
shadbuf.c
tuhopuu2/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu2/source/blender/src Makefile.am butspace.c
buttons_editing.c buttons_object.c
buttons_shading.c drawmesh.c
drawobject.c drawtext.c drawview.c
edit.c editaction.c editarmature.c
editconstraint.c editface.c
editipo.c editmesh.c editnla.c
editobject.c editscreen.c
editsima.c filesel.c ghostwinlay.c
header_action.c header_image.c
header_info.c header_view3d.c
headerbuttons.c interface.c
language.c renderwin.c resources.c
sector.c space.c spacetypes.c
toets.c toolbox.c usiblender.c
view.c vpaint.c
Added files:
tuhopuu2/extern/solid Makefile.in aclocal.m4 configure
tuhopuu2/extern/solid/doc Makefile.in stamp-vti version.texi
tuhopuu2/extern/solid/examples Makefile.in
tuhopuu2/extern/solid/examples/dynamics Makefile.in
tuhopuu2/extern/solid/include Makefile.in config.h.in
tuhopuu2/extern/solid/src Makefile.in
tuhopuu2/extern/solid/src/broad Makefile.in
tuhopuu2/extern/solid/src/complex Makefile.in
tuhopuu2/extern/solid/src/convex Makefile.in
Removed files:
tuhopuu2/source/blender/imbuf/intern bmp_decode.c png_decode.c
png_encode.c
tuhopuu2/source/blender/makesdna DNA_facebig.h DNA_facesmall.h
tuhopuu2/source/blender/render/intern/include
RE_DummyShadowBuffer.h
RE_ShadowBuffer.h
RE_basicShadowBuffer.h
shadowBuffer.h
tuhopuu2/source/blender/render/intern/source
RE_DummyShadowBuffer.cpp
RE_basicShadowBuffer.cpp
shadowBuffer.cpp
Log:
Post-merge conflict resolution
Revision Changes Path
1.11 +1 -2 tuhopuu2/Makefile
1.7 +1 -1 tuhopuu2/Makefile.am
1.13 +1 -0 tuhopuu2/configure.ac
1.4 +2 -0 tuhopuu2/bin/.blender/.Blanguages
1.3 +1 -2 tuhopuu2/intern/ghost/intern/GHOST_C-api.cpp
1.3 +3 -5 tuhopuu2/intern/ghost/intern/GHOST_Window.cpp
1.7 +2 -4 tuhopuu2/intern/ghost/intern/GHOST_WindowWin32.cpp
1.3 +15 -0 tuhopuu2/projectfiles/blender/blender.dsw
1.10 +16 -0 tuhopuu2/projectfiles/blender/src/BL_src.dsp
1.4 +22 -10 tuhopuu2/release/Makefile
1.7 +3 -1 tuhopuu2/source/Makefile
1.7 +3 -3 tuhopuu2/source/nan_compile.mk
1.5 +3 -3 tuhopuu2/source/nan_link.mk
1.4 +2 -1 tuhopuu2/source/blender/Makefile.am
1.5 +1 -2 tuhopuu2/source/blender/blenkernel/BKE_action.h
1.3 +3 -3 tuhopuu2/source/blender/blenkernel/BKE_effect.h
1.4 +1 -2 tuhopuu2/source/blender/blenkernel/BKE_global.h
1.6 +9 -10 tuhopuu2/source/blender/blenkernel/intern/action.c
1.5 +1 -2 tuhopuu2/source/blender/blenkernel/intern/armature.c
1.5 +2 -1 tuhopuu2/source/blender/blenkernel/intern/blender.c
1.11 +4 -1 tuhopuu2/source/blender/blenkernel/intern/constraint.c
1.5 +211 -32 tuhopuu2/source/blender/blenkernel/intern/displist.c
1.4 +10 -8 tuhopuu2/source/blender/blenkernel/intern/effect.c
1.8 +17 -15 tuhopuu2/source/blender/blenkernel/intern/exotic.c
1.3 +17 -6 tuhopuu2/source/blender/blenkernel/intern/library.c
1.5 +197 -184 tuhopuu2/source/blender/blenkernel/intern/mball.c
1.5 +15 -16 tuhopuu2/source/blender/blenkernel/intern/object.c
1.3 +5 -4 tuhopuu2/source/blender/blenkernel/intern/scene.c
1.3 +57 -195 tuhopuu2/source/blender/blenkernel/intern/subsurf.c
1.4 +2 -1 tuhopuu2/source/blender/blenkernel/intern/text.c
1.3 +4 -1757 tuhopuu2/source/blender/blenkernel/intern/texture.c
1.3 +9 -3 tuhopuu2/source/blender/blenkernel/intern/world.c
1.3 +2 -12 tuhopuu2/source/blender/blenlib/BLI_arithb.h
1.4 +4 -51 tuhopuu2/source/blender/blenlib/intern/arithb.c
1.3 +278 -267 tuhopuu2/source/blender/blenlib/intern/freetypefont.c
1.10 +86 -14 tuhopuu2/source/blender/blenloader/intern/readfile.c
1.6 +6 -3 tuhopuu2/source/blender/blenloader/intern/writefile.c
1.5 +2 -1 tuhopuu2/source/blender/ftfont/intern/FTF_TTFont.cpp
1.5 +8 -4 tuhopuu2/source/blender/include/BDR_editobject.h
1.12 +11 -1 tuhopuu2/source/blender/include/BIF_editarmature.h
1.20 +7 -2 tuhopuu2/source/blender/include/BIF_editmesh.h
1.7 +13 -1 tuhopuu2/source/blender/include/BIF_interface.h
1.7 +2 -1 tuhopuu2/source/blender/include/BIF_resources.h
1.3 +4 -2 tuhopuu2/source/blender/include/BIF_space.h
1.3 +5 -3 tuhopuu2/source/blender/include/BSE_editipo.h
1.4 +11 -4 tuhopuu2/source/blender/include/BSE_headerbuttons.h
1.8 +9 -2 tuhopuu2/source/blender/include/blendef.h
1.7 +6 -1 tuhopuu2/source/blender/include/butspace.h
1.6 +2 -3 tuhopuu2/source/blender/include/interface.h
1.4 +2 -1 tuhopuu2/source/blender/include/mydevice.h
1.6 +4 -3 tuhopuu2/source/blender/makesdna/DNA_armature_types.h
1.3 +12 -5 tuhopuu2/source/blender/makesdna/DNA_material_types.h
1.9 +14 -8 tuhopuu2/source/blender/makesdna/DNA_mesh_types.h
1.6 +48 -29 tuhopuu2/source/blender/makesdna/DNA_scene_types.h
1.5 +2 -1 tuhopuu2/source/blender/makesdna/DNA_screen_types.h
1.3 +3 -1 tuhopuu2/source/blender/makesdna/DNA_texture_types.h
1.11 +52 -51 tuhopuu2/source/blender/makesdna/DNA_userdef_types.h
1.5 +2 -3 tuhopuu2/source/blender/makesdna/DNA_view3d_types.h
1.3 +10 -3 tuhopuu2/source/blender/makesdna/DNA_world_types.h
1.3 +3 -13 tuhopuu2/source/blender/makesdna/intern/makesdna.c
1.5 +25 -20 tuhopuu2/source/blender/render/extern/include/render_types.h
1.4 +66 -87 tuhopuu2/source/blender/render/intern/source/initrender.c
1.3 +1 -48 tuhopuu2/source/blender/render/intern/source/pixelblending.c
1.4 +910 -736 tuhopuu2/source/blender/render/intern/source/rendercore.c
1.4 +2 -1 tuhopuu2/source/blender/render/intern/source/renderdatabase.c
1.4 +11 -10 tuhopuu2/source/blender/render/intern/source/shadbuf.c
1.15 +973 -537 tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
1.8 +3 -0 tuhopuu2/source/blender/src/Makefile.am
1.3 +32 -27 tuhopuu2/source/blender/src/butspace.c
1.13 +50 -40 tuhopuu2/source/blender/src/buttons_editing.c
1.9 +179 -103 tuhopuu2/source/blender/src/buttons_object.c
1.8 +572 -451 tuhopuu2/source/blender/src/buttons_shading.c
1.8 +5 -4 tuhopuu2/source/blender/src/drawmesh.c
1.28 +26 -12 tuhopuu2/source/blender/src/drawobject.c
1.3 +33 -36 tuhopuu2/source/blender/src/drawtext.c
1.10 +131 -88 tuhopuu2/source/blender/src/drawview.c
1.19 +45 -33 tuhopuu2/source/blender/src/edit.c
1.3 +32 -28 tuhopuu2/source/blender/src/editaction.c
1.18 +12 -7 tuhopuu2/source/blender/src/editarmature.c
1.14 +6 -5 tuhopuu2/source/blender/src/editconstraint.c
1.6 +29 -15 tuhopuu2/source/blender/src/editface.c
1.5 +40 -13 tuhopuu2/source/blender/src/editipo.c
1.77 +844 -40 tuhopuu2/source/blender/src/editmesh.c
1.4 +11 -18 tuhopuu2/source/blender/src/editnla.c
1.51 +301 -216 tuhopuu2/source/blender/src/editobject.c
1.12 +9 -8 tuhopuu2/source/blender/src/editscreen.c
1.6 +8 -6 tuhopuu2/source/blender/src/editsima.c
1.7 +9 -2 tuhopuu2/source/blender/src/filesel.c
1.6 +2 -2 tuhopuu2/source/blender/src/ghostwinlay.c
1.3 +579 -79 tuhopuu2/source/blender/src/header_action.c
1.3 +371 -16 tuhopuu2/source/blender/src/header_image.c
1.4 +53 -27 tuhopuu2/source/blender/src/header_info.c
1.10 +535 -122 tuhopuu2/source/blender/src/header_view3d.c
1.18 +53 -14 tuhopuu2/source/blender/src/headerbuttons.c
1.12 +291 -119 tuhopuu2/source/blender/src/interface.c
1.5 +3 -3 tuhopuu2/source/blender/src/language.c
1.5 +26 -15 tuhopuu2/source/blender/src/renderwin.c
1.8 +40 -36 tuhopuu2/source/blender/src/resources.c
1.3 +3 -3 tuhopuu2/source/blender/src/sector.c
1.44 +170 -107 tuhopuu2/source/blender/src/space.c
1.4 +2 -1 tuhopuu2/source/blender/src/spacetypes.c
1.5 +27 -11 tuhopuu2/source/blender/src/toets.c
1.11 +392 -90 tuhopuu2/source/blender/src/toolbox.c
1.12 +34 -25 tuhopuu2/source/blender/src/usiblender.c
1.10 +18 -26 tuhopuu2/source/blender/src/view.c
1.6 +4 -6 tuhopuu2/source/blender/src/vpaint.c
More information about the tuhopuu-cvs
mailing list