Mario, I could not merge your branch into the product branch. Here is the merge error message:
Conflict: can't delete 3d-viewer/3d_rendering/3d_render_ogl_legacy.moved because it is not empty. Not deleting. Conflict adding file 3d-viewer/3d_rendering/3d_render_ogl_legacy. Moved existing file to 3d-viewer/3d_rendering/3d_render_ogl_legacy.moved. Conflict because 3d-viewer/3d_rendering/3d_render_ogl_legacy.moved is not versioned, but has versioned children. Versioned directory. Conflict: can't delete 3d-viewer/3d_rendering/3d_render_raytracing.moved because it is not empty. Not deleting. Conflict adding file 3d-viewer/3d_rendering/3d_render_raytracing. Moved existing file to 3d-viewer/3d_rendering/3d_render_raytracing.moved. Conflict because 3d-viewer/3d_rendering/3d_render_raytracing.moved is not versioned, but has versioned children. Versioned directory. Conflict: can't delete 3d-viewer/3d_rendering/3d_render_raytracing.moved/shapes2D because it is not empty. Not deleting. Conflict because 3d-viewer/3d_rendering/3d_render_raytracing.moved/shapes2D is not versioned, but has versioned children. Versioned directory. Conflict adding file 3d-viewer/3d_rendering/ccamera.cpp. Moved existing file to 3d-viewer/3d_rendering/ccamera.cpp.moved. 9 conflicts encountered. I'm not sure why this isn't merging cleanly. Please fix this so I can merge it. Also, every single bitmap has been updated which shouldn't happen. Only the bitmaps you added should get added to the bitmap sources. Please revert all of the bitmaps except the new bitmaps you added. Thanks, Wayne On 7/18/2016 12:49 PM, Chris Pavlina wrote: > I've actually stopped building it because I couldn't find any more real issues > and it was becoming a hassle to manage the separate branch... yeah, definitely > time to merge. > > On Fri, Jul 15, 2016 at 01:35:07PM -0400, Wayne Stambaugh wrote: >> One last call for known issues and/or objections before I merge this >> code into the product branch. >> >> On 7/3/2016 8:15 AM, Mário Luzeiro wrote: >>> Hi Chris, >>> >>> Thanks to some kind of divine help, somehow it looks to be solved and in >>> addition looks to be safe/free from crashes. >>> >>> Would you like to test it again and as a sort of validation, try to test it >>> with as many boards as possible ? >>> Pay attention on the zones generation or any forms created using polygons >>> and see if you find any issue. >>> >>> Regards, >>> Mario Luzeiro >>> ________________________________________ >>> From: Mário Luzeiro >>> Sent: 02 July 2016 21:46 >>> To: Chris Pavlina >>> Cc: Wayne Stambaugh; [email protected] >>> Subject: RE: [Kicad-developers] 3D-Viewer - Request for merge evaluation >>> >>> Good find Chris, >>> >>> That is an issue related with the triangulation library "Poly2Tri" >>> It may not be a bug with the library it self, but as it has very >>> restrictive data inputs, there could be some data that is making it not >>> happy. >>> I will investigate how can I fix the polygon.. >>> >>> Mario >>> ________________________________________ >>> From: Chris Pavlina [[email protected]] >>> Sent: 02 July 2016 19:17 >>> To: Mário Luzeiro >>> Cc: Wayne Stambaugh; [email protected] >>> Subject: Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation >>> >>> Got a bug for you. On rev 6132, the linked [1] board file reproducibly gives >>> the artifact shown [2] in both OpenGL and raytracer. Master branch has no >>> artifact. >>> >>> [1] https://misc.c4757p.com/new3d_trouble.kicad_pcb >>> [2] https://misc.c4757p.com/new3d_artifact.png >>> >> _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
