[tuhopuu-cvs] CVS commit: tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/source nan_definitions.mk tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_global.h BKE_main.h SConscript BKE_ika.h ...
Chris Want
cwant at ualberta.ca
Tue Jul 5 03:39:03 CEST 2005
hos (Chris Want) 2005/07/05 03:39:03 CEST
Modified files:
tuhopuu3/projectfiles/blender/blenkernel BKE_blenkernel.dsp
tuhopuu3/projectfiles/blender/src BL_src.dsp
tuhopuu3/source nan_definitions.mk
tuhopuu3/source/blender/blenkernel BKE_displist.h BKE_global.h
BKE_main.h SConscript
tuhopuu3/source/blender/blenkernel/intern blender.c displist.c
exotic.c font.c
ipo.c lattice.c
library.c material.c
object.c scene.c
tuhopuu3/source/blender/blenloader/intern readblenentry.c
readfile.c
writefile.c
tuhopuu3/source/blender/include BDR_editobject.h
BIF_editfont.h BIF_transform.h
butspace.h
tuhopuu3/source/blender/makesdna DNA_object_types.h
tuhopuu3/source/blender/makesdna/intern makesdna.c
tuhopuu3/source/blender/python/api2_2x Object.c
tuhopuu3/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu3/source/blender/src SConscript buttons_editing.c
buttons_object.c buttons_script.c
drawobject.c drawview.c edit.c
editaction.c editarmature.c
editcurve.c editfont.c editipo.c
editmball.c editmesh.c
editmesh_mods.c editmesh_tools.c
editmode_undo.c editobject.c
editview.c filesel.c
header_action.c header_info.c
header_view3d.c headerbuttons.c
interface.c meshtools.c outliner.c
space.c toets.c transform.c
transform_constraints.c
transform_conversions.c
transform_generics.c
transform_manipulator.c vpaint.c
Removed files:
tuhopuu3/source/blender/blenkernel BKE_ika.h
tuhopuu3/source/blender/blenkernel/intern ika.c
tuhopuu3/source/blender/include BIF_editika.h
tuhopuu3/source/blender/makesdna DNA_ika_types.h
tuhopuu3/source/blender/src editika.c
Log:
Post-merge conflict resolution
Revision Changes Path
1.6 +0 -8 tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenkernel/BKE_blenkernel.dsp.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.13 +0 -8 tuhopuu3/projectfiles/blender/src/BL_src.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.7 +2 -2 tuhopuu3/source/nan_definitions.mk
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.7 +0 -1 tuhopuu3/source/blender/blenkernel/BKE_displist.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.12 +2 -2 tuhopuu3/source/blender/blenkernel/BKE_global.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.3 +1 -2 tuhopuu3/source/blender/blenkernel/BKE_main.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_main.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.7 +0 -1 tuhopuu3/source/blender/blenkernel/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/SConscript.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.7 +0 -9 tuhopuu3/source/blender/blenkernel/intern/blender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.24 +20 -151 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
1.3 +1 -2 tuhopuu3/source/blender/blenkernel/intern/exotic.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/exotic.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.15 +3 -3 tuhopuu3/source/blender/blenkernel/intern/font.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.7 +52 -80 tuhopuu3/source/blender/blenkernel/intern/ipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/ipo.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.9 +0 -2 tuhopuu3/source/blender/blenkernel/intern/lattice.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/lattice.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.5 +26 -37 tuhopuu3/source/blender/blenkernel/intern/library.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/library.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.5 +2 -2 tuhopuu3/source/blender/blenkernel/intern/material.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/material.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.12 +125 -151 tuhopuu3/source/blender/blenkernel/intern/object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.13 +73 -139 tuhopuu3/source/blender/blenkernel/intern/scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.3 +1 -2 tuhopuu3/source/blender/blenloader/intern/readblenentry.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readblenentry.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.26 +55 -101 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
1.17 +0 -26 tuhopuu3/source/blender/blenloader/intern/writefile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.4 +0 -2 tuhopuu3/source/blender/include/BDR_editobject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_editobject.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.7 +1 -2 tuhopuu3/source/blender/include/BIF_editfont.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editfont.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.9 +3 -3 tuhopuu3/source/blender/include/BIF_transform.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.17 +3 -3 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.9 +15 -8 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.8&r2=1.9&cvsroot=tuhopuu>
1.5 +0 -2 tuhopuu3/source/blender/makesdna/intern/makesdna.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/intern/makesdna.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.3 +10 -36 tuhopuu3/source/blender/python/api2_2x/Object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Object.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.16 +10 -89 tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.13 +0 -1 tuhopuu3/source/blender/src/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.40 +73 -194 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
1.32 +23 -57 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
1.7 +0 -2 tuhopuu3/source/blender/src/buttons_script.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_script.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.36 +7 -9 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
1.27 +128 -127 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
1.9 +322 -480 tuhopuu3/source/blender/src/edit.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.10 +66 -60 tuhopuu3/source/blender/src/editaction.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.3 +1515 -1542tuhopuu3/source/blender/src/editarmature.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.4 +19 -47 tuhopuu3/source/blender/src/editcurve.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editcurve.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.14 +20 -44 tuhopuu3/source/blender/src/editfont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.16 +32 -41 tuhopuu3/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.10 +36 -34 tuhopuu3/source/blender/src/editmball.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.4 +12 -17 tuhopuu3/source/blender/src/editmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.9 +7 -6 tuhopuu3/source/blender/src/editmesh_mods.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.10 +12 -12 tuhopuu3/source/blender/src/editmesh_tools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.3 +2 -5 tuhopuu3/source/blender/src/editmode_undo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmode_undo.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.40 +104 -218 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
1.19 +10 -10 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.9 +16 -30 tuhopuu3/source/blender/src/filesel.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.3 +11 -11 tuhopuu3/source/blender/src/header_action.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_action.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.12 +10 -3 tuhopuu3/source/blender/src/header_info.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.30 +10 -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.29&r2=1.30&cvsroot=tuhopuu>
1.19 +13 -38 tuhopuu3/source/blender/src/headerbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.30 +7 -2 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
1.3 +4 -5 tuhopuu3/source/blender/src/meshtools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/meshtools.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.10 +130 -32 tuhopuu3/source/blender/src/outliner.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.58 +22 -33 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.57&r2=1.58&cvsroot=tuhopuu>
1.11 +3 -10 tuhopuu3/source/blender/src/toets.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.35 +49 -74 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
1.27 +38 -47 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
1.12 +124 -732 tuhopuu3/source/blender/src/transform_conversions.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.24 +22 -160 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
1.22 +95 -106 tuhopuu3/source/blender/src/transform_manipulator.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
1.10 +1 -3 tuhopuu3/source/blender/src/vpaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list