[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source Makefile nan_compile.mk nan_definitions.mk tuhopuu3/source/blender/blenkernel BKE_bad_level_calls.h BKE_displist.h tuhopuu3/source/blender/blenkernel/bad_level_call_stubs stubs.c tuhopuu3/source/blender/blenkernel/intern ...
Chris Want
cwant at ualberta.ca
Fri Aug 19 22:07:56 CEST 2005
hos (Chris Want) 2005/08/19 22:07:56 CEST
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/source Makefile nan_compile.mk
nan_definitions.mk
tuhopuu3/source/blender/blenkernel BKE_bad_level_calls.h
BKE_displist.h
tuhopuu3/source/blender/blenkernel/bad_level_call_stubs
stubs.c
tuhopuu3/source/blender/blenkernel/intern displist.c lattice.c
object.c
subsurf_ccg.c
tuhopuu3/source/blender/blenloader/intern readfile.c
tuhopuu3/source/blender/include BDR_drawobject.h
BIF_editdeform.h
BIF_editmesh.h BIF_editsima.h
BIF_interface.h
BIF_transform.h BSE_view.h
blendef.h butspace.h
tuhopuu3/source/blender/makesdna DNA_action_types.h
tuhopuu3/source/blender/python/api2_2x Blender.c Image.c
NMesh.c
tuhopuu3/source/blender/render/intern/source rendercore.c
tuhopuu3/source/blender/src buttons_editing.c buttons_logic.c
buttons_object.c drawimage.c
drawmesh.c drawobject.c drawview.c
editarmature.c editdeform.c
editface.c editmesh.c
editmesh_mods.c editmesh_tools.c
editobject.c editsima.c editview.c
header_image.c header_view3d.c
interface.c interface_draw.c
outliner.c resources.c space.c
toolbox.c transform.c
transform_conversions.c
transform_generics.c view.c
vpaint.c
tuhopuu3/source/gameengine/Ketsji KX_ConvertPhysicsObject.h
Log:
Post-merge conflict resolution
Revision Changes Path
1.33 +8 -2 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
1.8 +7 -0 tuhopuu3/source/Makefile
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/Makefile.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.10 +5 -1 tuhopuu3/source/nan_compile.mk
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_compile.mk.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.9 +1 -0 tuhopuu3/source/nan_definitions.mk
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.4 +27 -5 tuhopuu3/source/blender/blenkernel/BKE_bad_level_calls.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_bad_level_calls.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.13 +1 -0 tuhopuu3/source/blender/blenkernel/BKE_displist.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.10 +2 -5 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.9&r2=1.10&cvsroot=tuhopuu>
1.35 +9 -63 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
1.13 +191 -109 tuhopuu3/source/blender/blenkernel/intern/lattice.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/lattice.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.20 +3 -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.19&r2=1.20&cvsroot=tuhopuu>
1.16 +88 -45 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.15&r2=1.16&cvsroot=tuhopuu>
1.36 +55 -17 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
1.7 +1 -0 tuhopuu3/source/blender/include/BDR_drawobject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_drawobject.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.3 +3 -1 tuhopuu3/source/blender/include/BIF_editdeform.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editdeform.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.9 +1 -1 tuhopuu3/source/blender/include/BIF_editmesh.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editmesh.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.7 +5 -0 tuhopuu3/source/blender/include/BIF_editsima.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editsima.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.7 +2 -1 tuhopuu3/source/blender/include/BIF_interface.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_interface.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.12 +3 -2 tuhopuu3/source/blender/include/BIF_transform.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_transform.h.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.4 +5 -0 tuhopuu3/source/blender/include/BSE_view.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BSE_view.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.21 +1 -1 tuhopuu3/source/blender/include/blendef.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.21 +2 -1 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.4 +5 -12 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.3&r2=1.4&cvsroot=tuhopuu>
1.16 +46 -47 tuhopuu3/source/blender/python/api2_2x/Blender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Blender.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.6 +8 -8 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.5&r2=1.6&cvsroot=tuhopuu>
1.9 +17 -17 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.8&r2=1.9&cvsroot=tuhopuu>
1.18 +19 -7 tuhopuu3/source/blender/render/intern/source/rendercore.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/rendercore.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.52 +333 -223 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.51&r2=1.52&cvsroot=tuhopuu>
1.12 +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.11&r2=1.12&cvsroot=tuhopuu>
1.39 +39 -46 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
1.17 +13 -2 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.6 +69 -147 tuhopuu3/source/blender/src/drawmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawmesh.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.46 +91 -183 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.45&r2=1.46&cvsroot=tuhopuu>
1.36 +48 -33 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
1.12 +334 -185 tuhopuu3/source/blender/src/editarmature.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.8 +27 -3 tuhopuu3/source/blender/src/editdeform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editdeform.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.11 +22 -26 tuhopuu3/source/blender/src/editface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.11 +4 -11 tuhopuu3/source/blender/src/editmesh.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.14 +1 -1 tuhopuu3/source/blender/src/editmesh_mods.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.17 +29 -30 tuhopuu3/source/blender/src/editmesh_tools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.50 +14 -10 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.49&r2=1.50&cvsroot=tuhopuu>
1.17 +55 -20 tuhopuu3/source/blender/src/editsima.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.26 +36 -29 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
1.19 +4 -2 tuhopuu3/source/blender/src/header_image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.39 +40 -28 tuhopuu3/source/blender/src/header_view3d.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
1.34 +8 -5 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.33&r2=1.34&cvsroot=tuhopuu>
1.25 +15 -14 tuhopuu3/source/blender/src/interface_draw.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.19 +14 -11 tuhopuu3/source/blender/src/outliner.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.25 +16 -20 tuhopuu3/source/blender/src/resources.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.68 +47 -14 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.67&r2=1.68&cvsroot=tuhopuu>
1.28 +2 -3 tuhopuu3/source/blender/src/toolbox.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
1.38 +201 -82 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
1.19 +112 -20 tuhopuu3/source/blender/src/transform_conversions.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.29 +67 -21 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
1.15 +82 -0 tuhopuu3/source/blender/src/view.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.15 +212 -77 tuhopuu3/source/blender/src/vpaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.6 +1 -1 tuhopuu3/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list