<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Now I'm not sure which reverted my commits - merge by Maurice or revert by Campbell.<div>Anyway - my small changes of io_export_after_effects.py fixed a bug reported by one user.</div><div>The question is:</div><div>Should I re-commit?</div><div><br></div><div><br></div><div>That's the one I'm talking about (It's somehow been reverted):</div><div><br></div><div>Commit: bf55ccbbf9e6c8fcd8969cdd8627694944948948<br>Author: Bartek Skorupa<br>Date: Mon Nov 18 12:10:11 2013 +0100<br><a href="http://developer.blender.org/rBAbf55ccbbf9e6c8fcd8969cdd8627694944948948">http://developer.blender.org/rBAbf55ccbbf9e6c8fcd8969cdd8627694944948948</a><br><br>Better calculation of framerate<br><br>Frames per second now take fps_base into account.<br>This ensures to have framerates like 29.97 or 23.976 properly<br>interpreted in After Effects.<br><br>===================================================================<br><br>M<span class="Apple-tab-span" style="white-space: pre; "> </span>io_export_after_effects.py<br><br>===================================================================<br><br>diff --git a/io_export_after_effects.py b/io_export_after_effects.py<br>index 65f2127..56396ee 100644<br>--- a/io_export_after_effects.py<br>+++ b/io_export_after_effects.py<br>@@ -22,8 +22,8 @@ bl_info = {<br> "name": "Export: Adobe After Effects (.jsx)",<br> "description": "Export cameras, selected objects & camera solution 3D Markers to Adobe After Effects CS3 and above",<br> "author": "Bartek Skorupa",<br>- "version": (0, 6, 3),<br>- "blender": (2, 62, 0),<br>+ "version": (0, 64),<br>+ "blender": (2, 6, 9),<br> "location": "File > Export > Adobe After Effects (.jsx)",<br> "warning": "",<br> "wiki_url": "<a href="http://wiki.blender.org/index.php/Extensions:2.6/Py/">http://wiki.blender.org/index.php/Extensions:2.6/Py/</a>"\<br>@@ -36,7 +36,7 @@ bl_info = {<br><br>import bpy<br>import datetime<br>-from math import degrees<br>+from math import degrees, floor<br>from mathutils import Matrix<br><br><br>@@ -49,7 +49,7 @@ def get_comp_data(context):<br> start = scene.frame_start<br> end = scene.frame_end<br> active_cam_frames = get_active_cam_for_each_frame(scene, start, end)<br>- fps = scene.render.fps<br>+ fps = floor(scene.render.fps / (scene.render.fps_base) * 1000.0) / 1000.0<br><br> return {<br> 'scn': scene,<br>@@ -569,7 +569,7 @@ def write_jsx_file(file, data, selection, include_animation, include_active_cam,<br> # create new comp<br> jsx_file.write('\nvar compName = prompt("Blender Comp\'s Name <a href="smb://nEnter">\\nEnter</a> Name of newly created Composition","BlendComp","Composition\'s Name");\n')<br> jsx_file.write('if (compName){') # Continue only if comp name is given. If not - terminate<br>- jsx_file.write('\nvar newComp = app.project.items.addComp(compName, %i, %i, %f, %f, %i);' %<br>+ jsx_file.write('\nvar newComp = app.project.items.addComp(compName, %i, %i, %f, %f, %f);' %<br> (data['width'], data['height'], data['aspect'], data['duration'], data['fps']))<br> jsx_file.write('\nnewComp.displayStartTime = %f;\n\n\n' % ((data['start'] + 1.0) / data['fps']))</div><div><br></div><div><br></div><div>Regards</div><div><div apple-content-edited="true">
<span class="Apple-style-span" style="border-collapse: separate; border-spacing: 0px; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; "><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; "><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>Bartek Skorupa</div><div><br></div><div><a href="http://www.bartekskorupa.com">www.bartekskorupa.com</a></div></div></span></span></span>
</div>
<br><div><div>On 18 lis 2013, at 21:38, Campbell Barton <<a href="mailto:ideasman42@gmail.com">ideasman42@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">This commit has been reverted, anyone who has checked out addons at<br>this revision will have to run this in the addons repository:<br><br>git fetch --force<br>git reset --hard origin/master<br><br>Maybe we could have some commit hook to disallow such commits in the<br>future since its bound to happen when devs are getting used to git for<br>the first time.<br><br>On Tue, Nov 19, 2013 at 6:54 AM, Sergey Sharybin <<a href="mailto:sergey.vfx@gmail.com">sergey.vfx@gmail.com</a>> wrote:<br><blockquote type="cite">Please NEVER commit merges to the master branch.<br><br>To prevent this run `git pull --rebase` to pull latest changes from from the<br>server and then `git push` to upload your commits to the server.<br><br><br>On Tue, Nov 19, 2013 at 1:21 AM, Maurice Raybaud <<a href="mailto:noreply@git.blender.org">noreply@git.blender.org</a>><br>wrote:<br><blockquote type="cite"><br>Commit: ff8ac3525a3efc19cc598fe12411084dc2e42464<br>Author: Maurice Raybaud<br>Date: Mon Nov 18 20:08:16 2013 +0100<br><a href="http://developer.blender.org/rBAff8ac3525a3efc19cc598fe12411084dc2e42464">http://developer.blender.org/rBAff8ac3525a3efc19cc598fe12411084dc2e42464</a><br><br>Merge branch 'master' of git.blender.org:blender-addons<br><br>===================================================================<br><br><br><br>===================================================================<br><br><br><br>_______________________________________________<br>Bf-extensions-cvs mailing list<br>Bf-extensions-cvs@blender.org<br>http://lists.blender.org/mailman/listinfo/bf-extensions-cvs<br></blockquote><br><br><br><br>--<br>With best regards, Sergey Sharybin<br><br>_______________________________________________<br>Bf-python mailing list<br><a href="mailto:Bf-python@blender.org">Bf-python@blender.org</a><br>http://lists.blender.org/mailman/listinfo/bf-python<br><br></blockquote><br><br><br>-- <br>- Campbell<br>_______________________________________________<br>Bf-python mailing list<br><a href="mailto:Bf-python@blender.org">Bf-python@blender.org</a><br>http://lists.blender.org/mailman/listinfo/bf-python<br></blockquote></div><br></div></body></html>