From: Carlos L. G. <gen...@gm...> - 2013-08-04 09:42:21
|
Hi! Thanks to Zelgadis I've been able to successfully rebase this branch onto master. I'm working on it now and have implemented the use of ValueBase for the PasteCanvas layer parameters. What's I've noticed is that when opening the logo.sif file from examples and then closing the application, there is a complain about not deleted canvases. Looks like converting the canvas parameter to ValueBase leads to some problems on some files. This is implemented on this commit: https://github.com/genete/synfig/commit/f7eab9281358ff5ababddabf0f7bda224f121c2e The use of ValueBase on parameters is basically to allow to store on it additional information that can be changed by the user for each parameter and individual layer. This information can be used later to perform (or not) specific actions on parameters and act differently for some types of actions. In particular, the original reason on making this change is to allow to use specific interpolation types for certain parameters. Also, as a bonus, the option of not animate the parameter in animation mode (the static option of the parameter) has been moved from the layer data to the ValueBase data. The thing is that the canvas parameter didn't have the static option when originally implemented and also, it has not meaning have any kind of interpolation for canvases parameter when animated. So make the canvas parameter to use the ValueBase is not so much useful at this moment. For that reason I've decided to not implement it on the canvas parameter because it leads some warning messages when done. In the future, if someone needs to store some data on the parameter itself, the commit mentioned above helps to know how to convert canvas parameter to ValueBase but the warning messages that appear when closing the application should be fixed. Cheers! 2013/7/31 Carlos López González <gen...@gm...> > Hi thank you very much for the detailed instructions! > > Before see your vide I've tried to do this: > > git checkout param-interpolation > git rebase -i master > > Possibly I have reseted hard the repository before do that. > Then I accepted all the picks and it worked fine until the last commit > where there was a conflict on the same file than your example. Then I > resolved it and continued rebasing. > I'll remember all your recommendations next time! > Cheers! > > > 2013/7/31 Konstantin Dmitriev <kse...@gm...> > >> Hi, Carlos! >> >> 2013/7/31 Carlos López González <gen...@gm...>: >> > Hi! >> > In the current master branch of my development repository I've rebased >> the >> > following changes: >> > Fix bug #450: fixing this bug has implied to rewrite all the Cairo >> render >> > system. >> > Remove unused: this branch fixes several compiler warning due to unused >> > variables. It also replaces some auto tool macros that were deprecated. >> > Fix bug #461: I've been lucky on find the root cause and although I >> used the >> > workaround to fix it, we do know know why is it produced. See the commit >> > explanation. >> > >> > Also there is a unmerged branch called param-interpolation that I have >> > developed based on a initial work of Zelgadis of the same branch on its >> > repository. I've tried to rebase that branch onto master or onto >> > intermediate commits of the master branch but I always get conflicts >> and I >> > different lines. It talks sometimes about trailing white spaces and >> always >> > mention that my local changes will be overwritten by merge and that I >> need >> > to stash my changes before merge. Them it leaves me the HEAD of the >> > repository with some commits rebased but not all the complete branch, >> and it >> > does that always at different commits. >> >> I've tested the rebase operation. It complained about conflict once, >> but I have fixed it. >> Here I have recorded screencast for this process: >> http://nekaka.com/d/686EPQEhh6 >> >> I've tested the rebase operation twice. For me it always happens at >> the same commit. >> I guess you run the rebase operation on the dirty tree (git reset >> --hard && git clean -f -d) OR not correctly aborted previous rebase >> operation (it should be done with "git rebase --abort") >> >> K. >> >> >> >> >> -- >> http://morevnaproject.org/ >> > > > > -- > Carlos > http://synfig.org > -- Carlos http://synfig.org |