[tuhopuu-devel] Re: [tuhopuu-cvs] CVS commit:
tuhopuu3/source/blender/src draw_hemesh.c Makefile
buttons_editing.c buttons_shading.c drawobject.c drawview.c
edit.c editmode_undo.c editobject.c editview.c filesel.c
header_info.c header_view3d.c headerbuttons.c outliner.c
resources.c space.c ...
Jean-Luc Peuriere
jlp at nerim.net
Mon Mar 28 11:14:38 CEST 2005
Le 28 mars 05, à 01:26, Joseph Eagar a écrit :
> 1.18 +14 -4 tuhopuu3/source/blender/src/drawobject.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/drawobject.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
> 1.2 +43 -37 tuhopuu3/source/blender/src/edit.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/edit.c.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +39 -4 tuhopuu3/source/blender/src/editmode_undo.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/editmode_undo.c.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.10 +15 -4 tuhopuu3/source/blender/src/editview.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/editview.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
> 1.2 +34 -15 tuhopuu3/source/blender/src/filesel.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/filesel.c.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.16 +22 -7 tuhopuu3/source/blender/src/header_view3d.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/header_view3d.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
> 1.13 +21 -2 tuhopuu3/source/blender/src/resources.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/resources.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
> 1.15 +4 -1 tuhopuu3/source/blender/src/transform.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/src/transform.h.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
> 1.2 +2 -1 tuhopuu3/source/blender/include/BDR_vpaint.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/include/BDR_vpaint.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.10 +7 -2 tuhopuu3/source/blender/include/BIF_resources.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/include/BIF_resources.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
> 1.2 +27 -7 tuhopuu3/source/blender/include/BIF_transform.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/include/BIF_transform.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +29 -1
> tuhopuu3/source/blender/blenkernel/BKE_displist.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/BKE_displist.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.5 +5 -2 tuhopuu3/source/blender/blenkernel/BKE_global.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/BKE_global.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
> 1.2 +11 -2 tuhopuu3/source/blender/blenkernel/BKE_subsurf.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/BKE_subsurf.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +4 -3
> tuhopuu3/source/blender/blenkernel/intern/Makefile
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/Makefile.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.8 +151 -7
> tuhopuu3/source/blender/blenkernel/intern/displist.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/displist.c.diff?
> r1=1.7&r2=1.8&cvsroot=tuhopuu>
> 1.2 +13 -2
> tuhopuu3/source/blender/blenkernel/intern/lattice.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/lattice.c.diff?
> r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +36 -30
> tuhopuu3/source/blender/blenkernel/intern/library.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/library.c.diff?
> r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +52 -25
> tuhopuu3/source/blender/blenkernel/intern/material.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/material.c.diff?
> r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.5 +16 -2
> tuhopuu3/source/blender/blenkernel/intern/object.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/object.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
> 1.2 +220 -69
> tuhopuu3/source/blender/blenkernel/intern/subsurf.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenkernel/intern/subsurf.c.diff?
> r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +18 -1 tuhopuu3/source/blender/blenlib/BLI_winstuff.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenlib/BLI_winstuff.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.10 +34 -1 tuhopuu3/source/blender/blenlib/intern/arithb.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/blenlib/intern/arithb.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
> 1.2 +240 -102
> tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/renderconverter/intern/convertBlenderScene.c.diff?
> r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +3 -1 tuhopuu3/source/blender/makesdna/DNA_ID.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/makesdna/DNA_ID.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +4 -1
> tuhopuu3/source/blender/makesdna/DNA_mesh_types.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/makesdna/DNA_mesh_types.h.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +18 -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.1&r2=1.2&cvsroot=tuhopuu>
> 1.2 +3 -2
> tuhopuu3/source/blender/makesdna/DNA_screen_types.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/makesdna/DNA_screen_types.h.diff?
> r1=1.1&r2=1.2&cvsroot=tuhopuu>
> 1.4 +10 -1
> tuhopuu3/source/blender/makesdna/DNA_space_types.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/makesdna/DNA_space_types.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
> 1.8 +6 -2
> tuhopuu3/source/blender/makesdna/DNA_userdef_types.h
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/makesdna/DNA_userdef_types.h.diff?
> r1=1.7&r2=1.8&cvsroot=tuhopuu>
> 1.2 +10 -6
> tuhopuu3/source/blender/makesdna/intern/makesdna.c
>
> <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/
> blender/makesdna/intern/makesdna.c.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
> _______________________________________________
> tuhopuu-cvs mailing list
> tuhopuu-cvs at projects.blender.org
> http://projects.blender.org/mailman/listinfo/tuhopuu-cvs
>
>
Joseph,
Please review (with cvs diff) all the unwanted changes from base files.
you also ported back stuff previous to Hos syncing
You have at least one conflict (with measurement stuff) in global.h
golden rule when preparing a commit :
- cvs update
- compile
- cvs update again if someone changed anything
- cvs diff and examine all changes
- cvs commit
--
Jean-Luc
More information about the tuhopuu-devel
mailing list