[Soc-2005-dev] Re: [Soc-2005-cvs] CVS commit: soc-blender/extern/bullet/Bullet Bullet3_vc8.vcproj soc-blender/extern/bullet/Bullet/NarrowPhaseCollision VoronoiSimplexSolver.cpp soc-blender/extern/bullet/Demos/ConcaveDemo ConcaveDemo_vc8.vcproj soc-blender/extern/bullet/Demos/Raytracer Raytracer.cpp soc-blender/source/blender/blenkernel BKE_modifier.h soc-blender/source/blender/blenkernel/intern modifier.c

[Nils Thuerey]

Hello,

is it possible that there are still some files missing in the HEAD
version? I tried to merge with the new version, and got some error
message - so I checked out the whole HEAD revision, and I still get a
message that "eModifierMode_Editmode" is undeclared in DerivedMesh.c.
Checking with grep I think is's not defined anywhere, but used a few
times...

Regards,
-> Nils


Chris Want wrote:
> hos (Chris Want) 2005/07/25 04:22:13 CEST
> 
>   Modified files:
>     soc-blender/extern/bullet/Bullet Bullet3_vc8.vcproj 
>     soc-blender/extern/bullet/Bullet/NarrowPhaseCollision 
>                                                           VoronoiSimplexSolver.cpp 
>     soc-blender/extern/bullet/Demos/ConcaveDemo 
>                                                 ConcaveDemo_vc8.vcproj 
>     soc-blender/extern/bullet/Demos/Raytracer Raytracer.cpp 
>     soc-blender/source/blender/blenkernel BKE_modifier.h 
>     soc-blender/source/blender/blenkernel/intern modifier.c 
>   
>   Log:
>   Post-merge conflict resolution
>   
>   Revision  Changes    Path
>   1.2       +8 -9      soc-blender/extern/bullet/Bullet/Bullet3_vc8.vcproj
>     <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/Bullet3_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
>   1.2       +11 -0     soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp
>     <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
>   1.2       +1 -8      soc-blender/extern/bullet/Demos/ConcaveDemo/ConcaveDemo_vc8.vcproj
>     <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/ConcaveDemo/ConcaveDemo_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
>   1.2       +17 -7     soc-blender/extern/bullet/Demos/Raytracer/Raytracer.cpp
>     <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/Raytracer/Raytracer.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
>   1.2       +69 -17    soc-blender/source/blender/blenkernel/BKE_modifier.h
>     <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/BKE_modifier.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
>   1.2       +666 -55   soc-blender/source/blender/blenkernel/intern/modifier.c
>     <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/intern/modifier.c.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
> _______________________________________________
> Soc-2005-cvs mailing list
> Soc-2005-cvs at blender.org
> http://projects.blender.org/mailman/listinfo/soc-2005-cvs
> 


-- 

. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
.                                                                     .
.          Nils Thuerey                                               .
.          LSS, Inf10 - University of Erlangen Nuremberg              .
.          http://www.ntoken.com                                      .
.          http://www10.informatik.uni-erlangen.de/~sinithue/         .
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : http://projects.blender.org/pipermail/soc-2005-dev/attachments/20050725/e75024bb/signature.pgp