[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/release/bpydata KUlang.txt readme.txt tuhopuu3/release/scripts unweld044.py tuhopuu3/source/blender/blenkernel/intern ...
Chris Want
cwant at ualberta.ca
Mon Apr 18 06:40:31 CEST 2005
hos (Chris Want) 2005/04/18 06:40:30 CEST
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj
tuhopuu3/projectfiles/blender/src BL_src.dsp
tuhopuu3/source/blender/blenkernel/intern displist.c
material.c object.c
scene.c
tuhopuu3/source/blender/blenloader/intern readfile.c
tuhopuu3/source/blender/include butspace.h
tuhopuu3/source/blender/makesdna DNA_material_types.h
DNA_meta_types.h
DNA_object_types.h
tuhopuu3/source/blender/python BPY_menus.c BPY_menus.h
tuhopuu3/source/blender/python/api2_2x Blender.c
tuhopuu3/source/blender/render/intern/source rendercore.c
tuhopuu3/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu3/source/blender/src SConscript buttons_editing.c
buttons_object.c buttons_shading.c
drawobject.c drawview.c edit.c
editaction.c editipo.c editmball.c
editobject.c editview.c filesel.c
headerbuttons.c previewrender.c
space.c toets.c transform.c
transform_constraints.c
transform_generics.c
transform_manipulator.c
transform_numinput.c
Removed files:
tuhopuu3/release/bpydata KUlang.txt readme.txt
tuhopuu3/release/scripts unweld044.py
tuhopuu3/source/blender/src transform.h
transform_constraints.h
transform_generics.h
transform_numinput.h
Log:
Post-merge conflict resolution
Revision Changes Path
1.16 +4 -4 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.4 +35 -58 tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.7 +0 -12 tuhopuu3/projectfiles/blender/src/BL_src.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.18 +2 -2 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.3 +3 -1 tuhopuu3/source/blender/blenkernel/intern/material.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/material.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.8 +18 -3 tuhopuu3/source/blender/blenkernel/intern/object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.6 +1 -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.5&r2=1.6&cvsroot=tuhopuu>
1.12 +17 -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.11&r2=1.12&cvsroot=tuhopuu>
1.10 +4 -1 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.6 +3 -1 tuhopuu3/source/blender/makesdna/DNA_material_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_material_types.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.4 +2 -1 tuhopuu3/source/blender/makesdna/DNA_meta_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_meta_types.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.6 +3 -1 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.5&r2=1.6&cvsroot=tuhopuu>
1.9 +6 -1 tuhopuu3/source/blender/python/BPY_menus.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.5 +2 -1 tuhopuu3/source/blender/python/BPY_menus.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.10 +186 -2 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.9&r2=1.10&cvsroot=tuhopuu>
1.11 +31 -39 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.10&r2=1.11&cvsroot=tuhopuu>
1.7 +37 -14 tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.9 +1 -0 tuhopuu3/source/blender/src/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.23 +53 -42 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
1.20 +36 -4 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.27 +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.26&r2=1.27&cvsroot=tuhopuu>
1.27 +21 -4 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
1.18 +3 -3 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.5 +2 -2 tuhopuu3/source/blender/src/edit.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/edit.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.7 +4 -4 tuhopuu3/source/blender/src/editaction.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.11 +3 -3 tuhopuu3/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.7 +12 -7 tuhopuu3/source/blender/src/editmball.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.29 +25 -7 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
1.15 +9 -2 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.4 +2 -2 tuhopuu3/source/blender/src/filesel.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.14 +3 -3 tuhopuu3/source/blender/src/headerbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.10 +1 -1 tuhopuu3/source/blender/src/previewrender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.44 +4 -2 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.43&r2=1.44&cvsroot=tuhopuu>
1.7 +2 -2 tuhopuu3/source/blender/src/toets.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.25 +47 -1620 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.20 +2 -4 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.18 +1 -4 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.12 +54 -9 tuhopuu3/source/blender/src/transform_manipulator.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.6 +0 -1 tuhopuu3/source/blender/src/transform_numinput.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list