No problems to commit the changes, just rebase when pulling and double check your repo doesn't contain any recent merges before pushing.
On Tue, Nov 19, 2013 at 9:44 AM, Bartek Skorupa (priv) <[email protected]> wrote: > Now I'm not sure which reverted my commits - merge by Maurice or revert by > Campbell. > Anyway - my small changes of io_export_after_effects.py fixed a bug reported > by one user. > The question is: > Should I re-commit? > > > That's the one I'm talking about (It's somehow been reverted): > > Commit: bf55ccbbf9e6c8fcd8969cdd8627694944948948 > Author: Bartek Skorupa > Date: Mon Nov 18 12:10:11 2013 +0100 > http://developer.blender.org/rBAbf55ccbbf9e6c8fcd8969cdd8627694944948948 > > Better calculation of framerate > > Frames per second now take fps_base into account. > This ensures to have framerates like 29.97 or 23.976 properly > interpreted in After Effects. > > =================================================================== > > M io_export_after_effects.py > > =================================================================== > > diff --git a/io_export_after_effects.py b/io_export_after_effects.py > index 65f2127..56396ee 100644 > --- a/io_export_after_effects.py > +++ b/io_export_after_effects.py > @@ -22,8 +22,8 @@ bl_info = { > "name": "Export: Adobe After Effects (.jsx)", > "description": "Export cameras, selected objects & camera solution 3D > Markers to Adobe After Effects CS3 and above", > "author": "Bartek Skorupa", > - "version": (0, 6, 3), > - "blender": (2, 62, 0), > + "version": (0, 64), > + "blender": (2, 6, 9), > "location": "File > Export > Adobe After Effects (.jsx)", > "warning": "", > "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"\ > @@ -36,7 +36,7 @@ bl_info = { > > import bpy > import datetime > -from math import degrees > +from math import degrees, floor > from mathutils import Matrix > > > @@ -49,7 +49,7 @@ def get_comp_data(context): > start = scene.frame_start > end = scene.frame_end > active_cam_frames = get_active_cam_for_each_frame(scene, start, end) > - fps = scene.render.fps > + fps = floor(scene.render.fps / (scene.render.fps_base) * 1000.0) / > 1000.0 > > return { > 'scn': scene, > @@ -569,7 +569,7 @@ def write_jsx_file(file, data, selection, > include_animation, include_active_cam, > # create new comp > jsx_file.write('\nvar compName = prompt("Blender Comp\'s Name \\nEnter > Name of newly created Composition","BlendComp","Composition\'s Name");\n') > jsx_file.write('if (compName){') # Continue only if comp name is given. > If not - terminate > - jsx_file.write('\nvar newComp = app.project.items.addComp(compName, %i, > %i, %f, %f, %i);' % > + jsx_file.write('\nvar newComp = app.project.items.addComp(compName, %i, > %i, %f, %f, %f);' % > (data['width'], data['height'], data['aspect'], > data['duration'], data['fps'])) > jsx_file.write('\nnewComp.displayStartTime = %f;\n\n\n' % > ((data['start'] + 1.0) / data['fps'])) > > > Regards > Bartek Skorupa > > www.bartekskorupa.com > > On 18 lis 2013, at 21:38, Campbell Barton <[email protected]> wrote: > > This commit has been reverted, anyone who has checked out addons at > this revision will have to run this in the addons repository: > > git fetch --force > git reset --hard origin/master > > Maybe we could have some commit hook to disallow such commits in the > future since its bound to happen when devs are getting used to git for > the first time. > > On Tue, Nov 19, 2013 at 6:54 AM, Sergey Sharybin <[email protected]> > wrote: > > Please NEVER commit merges to the master branch. > > To prevent this run `git pull --rebase` to pull latest changes from from the > server and then `git push` to upload your commits to the server. > > > On Tue, Nov 19, 2013 at 1:21 AM, Maurice Raybaud <[email protected]> > wrote: > > > Commit: ff8ac3525a3efc19cc598fe12411084dc2e42464 > Author: Maurice Raybaud > Date: Mon Nov 18 20:08:16 2013 +0100 > http://developer.blender.org/rBAff8ac3525a3efc19cc598fe12411084dc2e42464 > > Merge branch 'master' of git.blender.org:blender-addons > > =================================================================== > > > > =================================================================== > > > > _______________________________________________ > Bf-extensions-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-extensions-cvs > > > > > > -- > With best regards, Sergey Sharybin > > _______________________________________________ > Bf-python mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-python > > > > > -- > - Campbell > _______________________________________________ > Bf-python mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-python > > > > _______________________________________________ > Bf-python mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-python > -- - Campbell _______________________________________________ Bf-python mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-python
