Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Cirilo Bernardo
Congratulations on the merge. Now I don't need to switch between various branches when I'm working with MCAD models. Thanks for the new 3DViewer; the entire 3D refactoring was a much bigger job than I originally imagined and you did a much better job of the rendering than I could have done. - Ci

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Wayne Stambaugh
On 7/19/2016 4:25 PM, Mário Luzeiro wrote: > Hi Wayne, > > It builds and it is working for me. I also compared the two branchs (diff) > and looks ok. > I will now start using the main branch and keep testing it. > > Thanks for the merge Wayne! > It will make some users very happy, Very nice wor

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Mário Luzeiro
Hi Wayne, It builds and it is working for me. I also compared the two branchs (diff) and looks ok. I will now start using the main branch and keep testing it. Thanks for the merge Wayne! It will make some users very happy, It was a long journey to get into this point, it was started early 2015.

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Wayne Stambaugh
Mario, I committed your merge request in the product branch version r6985. Thank you for your contribution to KiCad. This was a very large change set (much larger than I'm typically comfortable merging) so please let me know if I missed anything. Wayne On 7/19/2016 1:19 PM, Mário Luzeiro wrote:

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Mário Luzeiro
Hi Wayne, I wrote this text below. Is that ok or you would like something more technical / detailed? Feel free to make any changes or corrections. "This is a completely refactoring of the 3D-Viewer. It splits and rewrite the previous window (eda_3d_viewer) and canvas (eda_3d_canvas), creates a

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Wayne Stambaugh
Mario, Simon's patch merged cleanly. I just finished building and testing it and everything seems in order. I need a commit message from you. I do not have time to search through the commit history of your branch and put together a meaningful commit message. The other option is that I can comm

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Simon Richter
Hi Mário, > I've updated my branch with latest changes and clean the conflicts, > As I am not an expert, I am not sure how can I revert the old generated > bitmaps, > would you mind to make a new branch for me? With bzr, that is difficult. > I don't mind (and I prefer) that my branch history is

Re: [Kicad-developers] 3D-Viewer - Request for merge evaluation

2016-07-19 Thread Mário Luzeiro
Hi Simon, I've updated my branch with latest changes and clean the conflicts, As I am not an expert, I am not sure how can I revert the old generated bitmaps, would you mind to make a new branch for me? The issues with the merge, are related when the Cirilo branch was merged on main branch. The