[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/make/pb_2_0_1 blender_file.icns blender_player.icns blender_publisher.icns tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/source/blender/blenkernel BKE_global.h tuhopuu3/source/blender/blenkernel/intern blender.c ...
Chris Want
cwant at ualberta.ca
Sun Mar 20 15:20:15 CET 2005
hos (Chris Want) 2005/03/20 15:20:14 CET
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/projectfiles/blender/src BL_src.dsp
tuhopuu3/source/blender/blenkernel BKE_global.h
tuhopuu3/source/blender/blenkernel/intern blender.c displist.c
font.c ipo.c
object.c scene.c
tuhopuu3/source/blender/blenlib BLI_arithb.h
tuhopuu3/source/blender/blenlib/intern arithb.c freetypefont.c
psfont.c
tuhopuu3/source/blender/blenloader/intern readfile.c
tuhopuu3/source/blender/include BDR_drawobject.h
tuhopuu3/source/blender/makesdna DNA_scene_types.h
tuhopuu3/source/blender/python BPY_menus.c BPY_menus.h
tuhopuu3/source/blender/python/api2_2x Blender.c
tuhopuu3/source/blender/render/extern/include render.h
tuhopuu3/source/blender/src SConscript buttons_logic.c
buttons_object.c buttons_scene.c
buttons_shading.c drawimage.c
drawipo.c drawnla.c drawobject.c
drawsound.c drawtext.c drawview.c
editaction.c editface.c editipo.c
editmball.c editmesh_mods.c
editobject.c editscreen.c
editseq.c editsima.c editview.c
header_buttonswin.c header_image.c
header_info.c header_seq.c
header_sound.c header_text.c
header_view3d.c headerbuttons.c
interface.c interface_draw.c
interface_panel.c outliner.c
resources.c space.c toets.c
toolbox.c transform.c transform.h
transform_constraints.c
transform_constraints.h
transform_generics.c
transform_generics.h
transform_numinput.c
transform_numinput.h unwrapper.c
vpaint.c
Removed files:
tuhopuu3/make/pb_2_0_1 blender_file.icns blender_player.icns
blender_publisher.icns
tuhopuu3/source/blender/imbuf/intern IMB_openexr.h openexr.cpp
Log:
Post-merge conflict resolution
Revision Changes Path
1.11 +4 -2 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.4 +4 -0 tuhopuu3/projectfiles/blender/src/BL_src.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.4 +6 -1 tuhopuu3/source/blender/blenkernel/BKE_global.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_global.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.3 +1 -5 tuhopuu3/source/blender/blenkernel/intern/blender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.6 +1 -4 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.3 +1 -4 tuhopuu3/source/blender/blenkernel/intern/font.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.4 +0 -3 tuhopuu3/source/blender/blenkernel/intern/ipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/ipo.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.4 +0 -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.3&r2=1.4&cvsroot=tuhopuu>
1.5 +1 -2 tuhopuu3/source/blender/blenkernel/intern/scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.6 +13 -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.5&r2=1.6&cvsroot=tuhopuu>
1.8 +0 -4 tuhopuu3/source/blender/blenlib/intern/arithb.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.3 +4 -4 tuhopuu3/source/blender/blenlib/intern/freetypefont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/freetypefont.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.4 +0 -5 tuhopuu3/source/blender/blenlib/intern/psfont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/psfont.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.7 +14 -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.6&r2=1.7&cvsroot=tuhopuu>
1.3 +2 -1 tuhopuu3/source/blender/include/BDR_drawobject.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_drawobject.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.9 +2 -2 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.8&r2=1.9&cvsroot=tuhopuu>
1.4 +297 -207 tuhopuu3/source/blender/python/BPY_menus.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.3 +24 -14 tuhopuu3/source/blender/python/BPY_menus.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.8 +141 -95 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.7&r2=1.8&cvsroot=tuhopuu>
1.5 +1 -6 tuhopuu3/source/blender/render/extern/include/render.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/extern/include/render.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.6 +1 -0 tuhopuu3/source/blender/src/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.5 +0 -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.4&r2=1.5&cvsroot=tuhopuu>
1.9 +0 -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.8&r2=1.9&cvsroot=tuhopuu>
1.11 +0 -13 tuhopuu3/source/blender/src/buttons_scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.18 +19 -5 tuhopuu3/source/blender/src/buttons_shading.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.9 +1 -2 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.5 +0 -1 tuhopuu3/source/blender/src/drawipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.3 +1 -2 tuhopuu3/source/blender/src/drawnla.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawnla.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.16 +9 -9 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
1.8 +1 -5 tuhopuu3/source/blender/src/drawsound.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawsound.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.5 +1 -1 tuhopuu3/source/blender/src/drawtext.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.14 +2 -2 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.5 +0 -4 tuhopuu3/source/blender/src/editaction.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.4 +0 -3 tuhopuu3/source/blender/src/editface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editface.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.7 +0 -1 tuhopuu3/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.4 +0 -3 tuhopuu3/source/blender/src/editmball.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.5 +0 -3 tuhopuu3/source/blender/src/editmesh_mods.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.15 +0 -1 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.9 +6 -5 tuhopuu3/source/blender/src/editscreen.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editscreen.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.5 +1 -2 tuhopuu3/source/blender/src/editseq.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editseq.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.9 +0 -1 tuhopuu3/source/blender/src/editsima.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.8 +0 -4 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.3 +1 -5 tuhopuu3/source/blender/src/header_buttonswin.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_buttonswin.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.11 +0 -4 tuhopuu3/source/blender/src/header_image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.4 +0 -4 tuhopuu3/source/blender/src/header_info.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_info.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.3 +1 -5 tuhopuu3/source/blender/src/header_seq.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_seq.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.9 +1 -5 tuhopuu3/source/blender/src/header_sound.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_sound.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.4 +0 -4 tuhopuu3/source/blender/src/header_text.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_text.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.14 +23 -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.13&r2=1.14&cvsroot=tuhopuu>
1.10 +11 -4 tuhopuu3/source/blender/src/headerbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.15 +0 -1 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.15 +0 -1 tuhopuu3/source/blender/src/interface_draw.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.4 +0 -1 tuhopuu3/source/blender/src/interface_panel.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_panel.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.4 +0 -4 tuhopuu3/source/blender/src/outliner.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.10 +0 -4 tuhopuu3/source/blender/src/resources.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/resources.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.35 +83 -20 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.34&r2=1.35&cvsroot=tuhopuu>
1.4 +0 -13 tuhopuu3/source/blender/src/toets.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toets.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.11 +0 -1 tuhopuu3/source/blender/src/toolbox.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.18 +783 -202 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.13 +25 -16 tuhopuu3/source/blender/src/transform.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.15 +131 -69 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.9 +2 -0 tuhopuu3/source/blender/src/transform_constraints.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.12 +139 -58 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.8 +8 -2 tuhopuu3/source/blender/src/transform_generics.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.h.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.4 +31 -22 tuhopuu3/source/blender/src/transform_numinput.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.4 +2 -2 tuhopuu3/source/blender/src/transform_numinput.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.6 +4 -5 tuhopuu3/source/blender/src/unwrapper.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/unwrapper.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.3 +1 -2 tuhopuu3/source/blender/src/vpaint.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/vpaint.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list