[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/source Makefile nan_definitions.mk nan_link.mk tuhopuu3/source/blender/blenkernel BKE_font.h BKE_image.h ...
Chris Want
cwant at ualberta.ca
Sat Sep 24 21:43:27 CEST 2005
hos (Chris Want) 2005/09/24 21:43:27 CEST
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp
tuhopuu3/projectfiles/blender/src BL_src.dsp
tuhopuu3/source Makefile nan_definitions.mk nan_link.mk
tuhopuu3/source/blender/blenkernel BKE_font.h BKE_image.h
SConscript
tuhopuu3/source/blender/blenkernel/intern Makefile blender.c
exotic.c font.c
image.c key.c
object.c
tuhopuu3/source/blender/blenlib BLI_vfontdata.h
tuhopuu3/source/blender/blenlib/intern freetypefont.c psfont.c
tuhopuu3/source/blender/blenloader/intern readfile.c
writefile.c
tuhopuu3/source/blender/img IMG_Api.h
tuhopuu3/source/blender/img/intern IMG_Api.cpp
IMG_CanvasRGBA32.cpp
IMG_CanvasRGBA32.h
tuhopuu3/source/blender/include BIF_editfont.h
BSE_trans_types.h blendef.h
butspace.h
tuhopuu3/source/blender/makesdna DNA_object_types.h
DNA_space_types.h
tuhopuu3/source/blender/makesdna/intern makesdna.c
tuhopuu3/source/blender/python/api2_2x NMesh.c
tuhopuu3/source/blender/radiosity/intern/source
radpostprocess.c
tuhopuu3/source/blender/render/intern/source texture.c
tuhopuu3/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu3/source/blender/src Makefile SConscript butspace.c
buttons_editing.c buttons_logic.c
buttons_object.c buttons_scene.c
buttons_script.c buttons_shading.c
drawimage.c drawobject.c
drawoops.c drawtext.c drawview.c
edit.c editarmature.c editface.c
editfont.c editipo.c editmesh.c
editmesh_tools.c editobject.c
editscreen.c editview.c
header_buttonswin.c header_image.c
header_info.c header_view3d.c
headerbuttons.c imagepaint.c
interface.c interface_draw.c
space.c toets.c toolbox.c
transform.c transform_generics.c
usiblender.c view.c vpaint.c
tuhopuu3/tools/scons/bs bs_libs.py
Removed files:
tuhopuu3/source/blender/include TPT_DependKludge.h
Log:
Post-merge conflict resolution
Revision Changes Path
1.38 +2 -2 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
1.11 +4 -4 tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.15 +6 -2 tuhopuu3/projectfiles/blender/src/BL_src.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.10 +1 -0 tuhopuu3/source/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/Makefile.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.10 +4 -3 tuhopuu3/source/nan_definitions.mk
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.4 +5 -1 tuhopuu3/source/nan_link.mk
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_link.mk.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.7 +5 -5 tuhopuu3/source/blender/blenkernel/BKE_font.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_font.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.4 +2 -1 tuhopuu3/source/blender/blenkernel/BKE_image.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_image.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.12 +2 -0 tuhopuu3/source/blender/blenkernel/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.6 +1 -0 tuhopuu3/source/blender/blenkernel/intern/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/Makefile.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.12 +6 -0 tuhopuu3/source/blender/blenkernel/intern/blender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.11 +6 -12 tuhopuu3/source/blender/blenkernel/intern/exotic.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/exotic.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.20 +285 -207 tuhopuu3/source/blender/blenkernel/intern/font.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.8 +32 -0 tuhopuu3/source/blender/blenkernel/intern/image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/image.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.3 +5 -4 tuhopuu3/source/blender/blenkernel/intern/key.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/key.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.22 +9 -0 tuhopuu3/source/blender/blenkernel/intern/object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
1.5 +15 -14 tuhopuu3/source/blender/blenlib/BLI_vfontdata.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_vfontdata.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.6 +77 -12 tuhopuu3/source/blender/blenlib/intern/freetypefont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/freetypefont.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.6 +1 -1 tuhopuu3/source/blender/blenlib/intern/psfont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/psfont.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.42 +22 -18 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.41&r2=1.42&cvsroot=tuhopuu>
1.28 +9 -1 tuhopuu3/source/blender/blenloader/intern/writefile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
1.4 +6 -6 tuhopuu3/source/blender/img/IMG_Api.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/img/IMG_Api.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.4 +13 -17 tuhopuu3/source/blender/img/intern/IMG_Api.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/img/intern/IMG_Api.cpp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.5 +30 -30 tuhopuu3/source/blender/img/intern/IMG_CanvasRGBA32.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/img/intern/IMG_CanvasRGBA32.cpp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.4 +7 -7 tuhopuu3/source/blender/img/intern/IMG_CanvasRGBA32.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/img/intern/IMG_CanvasRGBA32.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.8 +9 -0 tuhopuu3/source/blender/include/BIF_editfont.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editfont.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.4 +1 -10 tuhopuu3/source/blender/include/BSE_trans_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BSE_trans_types.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.23 +3 -0 tuhopuu3/source/blender/include/blendef.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
1.28 +8 -2 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
1.14 +5 -0 tuhopuu3/source/blender/makesdna/DNA_object_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_object_types.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.11 +2 -2 tuhopuu3/source/blender/makesdna/DNA_space_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_space_types.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.8 +2 -0 tuhopuu3/source/blender/makesdna/intern/makesdna.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/intern/makesdna.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.13 +1 -1 tuhopuu3/source/blender/python/api2_2x/NMesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/NMesh.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.6 +2 -1 tuhopuu3/source/blender/radiosity/intern/source/radpostprocess.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/radiosity/intern/source/radpostprocess.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.3 +9 -6 tuhopuu3/source/blender/render/intern/source/texture.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/texture.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.27 +7 -1 tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
1.4 +1 -0 tuhopuu3/source/blender/src/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/Makefile.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.15 +3 -1 tuhopuu3/source/blender/src/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.7 +7 -3 tuhopuu3/source/blender/src/butspace.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/butspace.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.60 +239 -33 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.59&r2=1.60&cvsroot=tuhopuu>
1.13 +1 -1 tuhopuu3/source/blender/src/buttons_logic.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_logic.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.45 +212 -21 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.44&r2=1.45&cvsroot=tuhopuu>
1.30 +157 -17 tuhopuu3/source/blender/src/buttons_scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
1.9 +1 -1 tuhopuu3/source/blender/src/buttons_script.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_script.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.37 +1 -1 tuhopuu3/source/blender/src/buttons_shading.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
1.21 +115 -134 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.49 +51 -7 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.48&r2=1.49&cvsroot=tuhopuu>
1.3 +4 -19 tuhopuu3/source/blender/src/drawoops.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawoops.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.28 +241 -231 tuhopuu3/source/blender/src/drawtext.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
1.41 +9 -3 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.40&r2=1.41&cvsroot=tuhopuu>
1.17 +24 -21 tuhopuu3/source/blender/src/edit.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.17 +6 -3 tuhopuu3/source/blender/src/editarmature.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.13 +3 -8 tuhopuu3/source/blender/src/editface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.19 +247 -165 tuhopuu3/source/blender/src/editfont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.23 +3 -1 tuhopuu3/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
1.15 +2 -1 tuhopuu3/source/blender/src/editmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.22 +6 -5 tuhopuu3/source/blender/src/editmesh_tools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
1.54 +3 -2 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.53&r2=1.54&cvsroot=tuhopuu>
1.21 +317 -89 tuhopuu3/source/blender/src/editscreen.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.32 +42 -18 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
1.8 +3 -0 tuhopuu3/source/blender/src/header_buttonswin.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_buttonswin.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.21 +13 -108 tuhopuu3/source/blender/src/header_image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.20 +2 -32 tuhopuu3/source/blender/src/header_info.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.42 +3 -6 tuhopuu3/source/blender/src/header_view3d.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.41&r2=1.42&cvsroot=tuhopuu>
1.26 +1 -14 tuhopuu3/source/blender/src/headerbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
1.4 +204 -257 tuhopuu3/source/blender/src/imagepaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/imagepaint.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.38 +37 -34 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
1.26 +128 -2 tuhopuu3/source/blender/src/interface_draw.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
1.72 +20 -27 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.71&r2=1.72&cvsroot=tuhopuu>
1.17 +7 -0 tuhopuu3/source/blender/src/toets.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.29 +1 -1 tuhopuu3/source/blender/src/toolbox.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
1.41 +14 -3 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.40&r2=1.41&cvsroot=tuhopuu>
1.34 +21 -31 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
1.25 +4 -7 tuhopuu3/source/blender/src/usiblender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.17 +6 -12 tuhopuu3/source/blender/src/view.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.19 +1 -1 tuhopuu3/source/blender/src/vpaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.8 +2 -1 tuhopuu3/tools/scons/bs/bs_libs.py
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/tools/scons/bs/bs_libs.py.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list