[tuhopuu-cvs] CVS commit: tuhopuu3/source/blender/blenkernel BKE_subsurf.h tuhopuu3/source/blender/blenkernel/intern displist.c exotic.c subsurf_ccg.c tuhopuu3/source/blender/blenlib BLI_arithb.h tuhopuu3/source/blender/blenlib/intern arithb.c tuhopuu3/source/blender/blenloader/intern readfile.c writefile.c ...
Chris Want
cwant at ualberta.ca
Sun Aug 21 07:14:03 CEST 2005
hos (Chris Want) 2005/08/21 07:14:03 CEST
Modified files:
tuhopuu3/source/blender/blenkernel BKE_subsurf.h
tuhopuu3/source/blender/blenkernel/intern displist.c exotic.c
subsurf_ccg.c
tuhopuu3/source/blender/blenlib BLI_arithb.h
tuhopuu3/source/blender/blenlib/intern arithb.c
tuhopuu3/source/blender/blenloader/intern readfile.c
writefile.c
tuhopuu3/source/blender/include BDR_vpaint.h BIF_editmesh.h
BSE_view.h
tuhopuu3/source/blender/makesdna DNA_object_types.h
tuhopuu3/source/blender/python/api2_2x NMesh.c
tuhopuu3/source/blender/radiosity/intern/source
radpostprocess.c
tuhopuu3/source/blender/src buttons_editing.c drawimage.c
drawipo.c drawobject.c drawview.c
edit.c editarmature.c editmesh.c
editmesh_mods.c editmesh_tools.c
editobject.c editsima.c editview.c
interface.c interface_panel.c
space.c transform.c
transform_conversions.c
transform_generics.c view.c
vpaint.c
Log:
Post-merge conflict resolution
Revision Changes Path
1.10 +1 -4 tuhopuu3/source/blender/blenkernel/BKE_subsurf.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_subsurf.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.36 +1 -1 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
1.9 +12 -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.8&r2=1.9&cvsroot=tuhopuu>
1.17 +339 -275 tuhopuu3/source/blender/blenkernel/intern/subsurf_ccg.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/subsurf_ccg.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.10 +1 -0 tuhopuu3/source/blender/blenlib/BLI_arithb.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_arithb.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.19 +38 -0 tuhopuu3/source/blender/blenlib/intern/arithb.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.37 +1 -0 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
1.25 +1 -0 tuhopuu3/source/blender/blenloader/intern/writefile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.4 +5 -2 tuhopuu3/source/blender/include/BDR_vpaint.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_vpaint.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.10 +7 -0 tuhopuu3/source/blender/include/BIF_editmesh.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editmesh.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.5 +5 -2 tuhopuu3/source/blender/include/BSE_view.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BSE_view.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.12 +0 -2 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.11&r2=1.12&cvsroot=tuhopuu>
1.10 +2 -2 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.9&r2=1.10&cvsroot=tuhopuu>
1.4 +1 -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.3&r2=1.4&cvsroot=tuhopuu>
1.54 +11 -23 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.53&r2=1.54&cvsroot=tuhopuu>
1.18 +16 -4 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.12 +2 -2 tuhopuu3/source/blender/src/drawipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.47 +166 -184 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.46&r2=1.47&cvsroot=tuhopuu>
1.37 +128 -8 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
1.14 +3 -1 tuhopuu3/source/blender/src/edit.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.13 +5 -1 tuhopuu3/source/blender/src/editarmature.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.12 +60 -94 tuhopuu3/source/blender/src/editmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.15 +28 -10 tuhopuu3/source/blender/src/editmesh_mods.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.18 +35 -3 tuhopuu3/source/blender/src/editmesh_tools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.51 +6 -1 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.50&r2=1.51&cvsroot=tuhopuu>
1.18 +0 -11 tuhopuu3/source/blender/src/editsima.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.27 +98 -12 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
1.35 +2 -1 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
1.8 +4 -4 tuhopuu3/source/blender/src/interface_panel.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_panel.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.69 +16 -12 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.68&r2=1.69&cvsroot=tuhopuu>
1.39 +1 -1 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
1.20 +1 -1 tuhopuu3/source/blender/src/transform_conversions.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.30 +10 -8 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.29&r2=1.30&cvsroot=tuhopuu>
1.16 +40 -16 tuhopuu3/source/blender/src/view.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.16 +122 -0 tuhopuu3/source/blender/src/vpaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list