[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/intern/guardedalloc/intern mallocn.c tuhopuu3/projectfiles/blender/blenlib BLI_blenlib.dsp tuhopuu3/source Makefile tuhopuu3/source/blender/blenkernel BKE_global.h tuhopuu3/source/blender/blenkernel/bad_level_call_stubs stubs.c ...
Chris Want
cwant at ualberta.ca
Thu Aug 25 04:11:41 CEST 2005
hos (Chris Want) 2005/08/25 04:11:41 CEST
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/intern/guardedalloc/intern mallocn.c
tuhopuu3/projectfiles/blender/blenlib BLI_blenlib.dsp
tuhopuu3/source Makefile
tuhopuu3/source/blender/blenkernel BKE_global.h
tuhopuu3/source/blender/blenkernel/bad_level_call_stubs
stubs.c
tuhopuu3/source/blender/blenkernel/intern displist.c exotic.c
object.c scene.c
subsurf_ccg.c
tuhopuu3/source/blender/blenlib SConscript
tuhopuu3/source/blender/blenloader/intern readfile.c
writefile.c
tuhopuu3/source/blender/include BDR_vpaint.h BIF_drawimage.h
BIF_editsima.h BIF_transform.h
butspace.h
tuhopuu3/source/blender/makesdna DNA_action_types.h
DNA_object_types.h
DNA_scene_types.h
tuhopuu3/source/blender/python/api2_2x Image.c NMesh.c
Object.c
tuhopuu3/source/blender/radiosity/intern/source
radpostprocess.c
radpreprocess.c
tuhopuu3/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu3/source/blender/src Makefile butspace.c
buttons_editing.c buttons_object.c
drawimage.c drawmesh.c
drawobject.c drawview.c edit.c
editarmature.c editdeform.c
editface.c editipo.c editmesh.c
editmesh_mods.c editmesh_tools.c
editnla.c editobject.c editsima.c
editview.c header_image.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_numinput.c unwrapper.c
usiblender.c vpaint.c
Log:
Post-merge conflict resolution
Revision Changes Path
1.34 +2 -2 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
1.3 +4 -10 tuhopuu3/intern/guardedalloc/intern/mallocn.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/guardedalloc/intern/mallocn.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.5 +8 -0 tuhopuu3/projectfiles/blender/blenlib/BLI_blenlib.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/blenlib/BLI_blenlib.dsp.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.9 +9 -5 tuhopuu3/source/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/Makefile.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.16 +1 -0 tuhopuu3/source/blender/blenkernel/BKE_global.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.11 +16 -0 tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.37 +46 -49 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
1.10 +93 -173 tuhopuu3/source/blender/blenkernel/intern/exotic.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/exotic.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.21 +27 -31 tuhopuu3/source/blender/blenkernel/intern/object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.16 +18 -1 tuhopuu3/source/blender/blenkernel/intern/scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.19 +121 -122 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.18&r2=1.19&cvsroot=tuhopuu>
1.5 +1 -0 tuhopuu3/source/blender/blenlib/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/SConscript.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.38 +42 -26 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
1.26 +2 -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.25&r2=1.26&cvsroot=tuhopuu>
1.5 +0 -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.4&r2=1.5&cvsroot=tuhopuu>
1.4 +2 -2 tuhopuu3/source/blender/include/BIF_drawimage.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_drawimage.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.8 +10 -4 tuhopuu3/source/blender/include/BIF_editsima.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editsima.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.13 +1 -0 tuhopuu3/source/blender/include/BIF_transform.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.22 +5 -7 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
1.5 +1 -0 tuhopuu3/source/blender/makesdna/DNA_action_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_action_types.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.13 +2 -3 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.12&r2=1.13&cvsroot=tuhopuu>
1.15 +27 -0 tuhopuu3/source/blender/makesdna/DNA_scene_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.7 +2 -2 tuhopuu3/source/blender/python/api2_2x/Image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Image.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.11 +57 -144 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.10&r2=1.11&cvsroot=tuhopuu>
1.7 +1 -6 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.6&r2=1.7&cvsroot=tuhopuu>
1.5 +0 -2 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.4&r2=1.5&cvsroot=tuhopuu>
1.5 +94 -96 tuhopuu3/source/blender/radiosity/intern/source/radpreprocess.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/radiosity/intern/source/radpreprocess.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.25 +58 -79 tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.3 +5 -1 tuhopuu3/source/blender/src/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/Makefile.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.6 +3 -0 tuhopuu3/source/blender/src/butspace.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/butspace.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.55 +108 -80 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.54&r2=1.55&cvsroot=tuhopuu>
1.40 +272 -226 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
1.19 +23 -37 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.7 +144 -45 tuhopuu3/source/blender/src/drawmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawmesh.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.48 +18 -21 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.47&r2=1.48&cvsroot=tuhopuu>
1.38 +28 -10 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
1.15 +1 -2 tuhopuu3/source/blender/src/edit.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.14 +5 -6 tuhopuu3/source/blender/src/editarmature.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.9 +2 -0 tuhopuu3/source/blender/src/editdeform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editdeform.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.12 +9 -102 tuhopuu3/source/blender/src/editface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.22 +40 -32 tuhopuu3/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
1.13 +51 -57 tuhopuu3/source/blender/src/editmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.16 +3 -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.15&r2=1.16&cvsroot=tuhopuu>
1.19 +174 -15 tuhopuu3/source/blender/src/editmesh_tools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.9 +0 -4 tuhopuu3/source/blender/src/editnla.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editnla.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.52 +19 -15 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.51&r2=1.52&cvsroot=tuhopuu>
1.19 +39 -566 tuhopuu3/source/blender/src/editsima.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.28 +11 -9 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
1.20 +7 -9 tuhopuu3/source/blender/src/header_image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.19 +15 -2 tuhopuu3/source/blender/src/header_info.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.41 +8 -12 tuhopuu3/source/blender/src/header_view3d.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.40&r2=1.41&cvsroot=tuhopuu>
1.24 +43 -38 tuhopuu3/source/blender/src/headerbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
1.36 +2 -0 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
1.8 +13 -37 tuhopuu3/source/blender/src/meshtools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/meshtools.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.20 +1 -1 tuhopuu3/source/blender/src/outliner.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.70 +23 -9 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.69&r2=1.70&cvsroot=tuhopuu>
1.16 +4 -3 tuhopuu3/source/blender/src/toets.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.40 +264 -93 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
1.31 +21 -7 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
1.21 +197 -17 tuhopuu3/source/blender/src/transform_conversions.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.31 +65 -26 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
1.9 +5 -2 tuhopuu3/source/blender/src/transform_numinput.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.9 +30 -25 tuhopuu3/source/blender/src/unwrapper.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/unwrapper.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.24 +1 -1 tuhopuu3/source/blender/src/usiblender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.23&r2=1.24&cvsroot=tuhopuu>
1.17 +62 -39 tuhopuu3/source/blender/src/vpaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list