{"ref":"refs/heads/master","push_id":55537432,"commits":[{"sha":"d40e9324da97bd5b755e9263503d0c82ad78a241","author":{"email":"9347efe031ffa25a4ce48f90146278ae81f7c0b6@954f8c5b-7b00-dc11-b283-0030488c597c","name":"campbellbarton"},"url":"https://api.github.com/repos/sambler/myblender/commits/d40e9324da97bd5b755e9263503d0c82ad78a241","message":"patch [#29651] Add a __str__ Method to Matutils Matrices so print(matrix) Shows Columns as Columns\nfrom Andrew Hale\n\nconverted from python string formatting to using BLI_dynstr\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42748 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"c19840d0076b6c1bc9134c35d1d398d5aa551e83","author":{"email":"d39ba5bc9a632ca3fd25978cd7d75b1413b0ca2f@954f8c5b-7b00-dc11-b283-0030488c597c","name":"gsrb3d"},"url":"https://api.github.com/repos/sambler/myblender/commits/c19840d0076b6c1bc9134c35d1d398d5aa551e83","message":"SVN maintenance.\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42749 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"cd51eca0cf8416343c43ea2292967816d9d6a72a","author":{"email":"e0bd417893f31c4ebbf49808e9b33016b11bdee8@954f8c5b-7b00-dc11-b283-0030488c597c","name":"dfelinto"},"url":"https://api.github.com/repos/sambler/myblender/commits/cd51eca0cf8416343c43ea2292967816d9d6a72a","message":"Cucumber, first batch of merge - UI changes and custom exit key\n---------------------------------------------------------------\nThis was a test drive to see how painful the merge will be.\nNext batches are:\n- use desktop option for fullscreen\n- multisampling option\n- bullet collision mask\n- python\n- storage (vbo, dl, ...)\n- lighting\n\n[lighting still needs review]\n[python could use review, although it should be straightforward]\n[storage should be tested more I think]\n\n\nMerged /branches/soc-2011-cucumber:r\n36991,37059,37157,37416,37497-37499,37501,37522,39036,40593\n\n36991:\n==UI==\n* Made some options available in Blender Game that were only available in Blender Render (camera resolution, animation fps)\n* Created a panel for the embedded player\n* Renamed the FPS option for the standalone player to Refresh Rate\n* Moved framing options to display\n* Made a button to launch the blender player from within blender (only tested on windows for now)\n\n37059:\n==UI==\n* Added the option to change the exit key for the BGE. The UI currently just sets a number, and this feature most likely does not work for blenderplayer yet. More work on this to come.\n* Removed the physics settings from the scene panel for the BGE.\n* Added an Add menu in the logic brick header.\n\n37157:\nMaking the bake options available in Blender Game\n\n37416:\nMaking the exit key UI element accept key presses instead of numbers. It still does not work for the Blenderplayer, and it does not limit the input to key presses (other events don't work for exiting)\n\n37497:\nSome more work on getting the exit key to work in the Blenderplayer.\nInput is now restricted to keyboard events only for the exit key UI.\n37498:\nSome clean up from the last commit.\nThe exit key setting affects the Blenderplayer now.\n37499:\nCleaning up some duplicate code. Now the reverseTranslateTable for converting blender key codes to ketsji key codes is only defined in BL_BlenderDataConverter.\n37501:\nCentralizing the exit key methods to the keyboard devices. This should make it easier to get exit key control to the python API.\n\n[37517: committed previously]\n\n37522:\nMoved control of the exit key away from the keyboard devices, and moved it to ketsjiengine.\nAdded setExitKey and getExitKey to the python API\n\n39036:\nA couple of the doversions were in the wrong spot. This should fix some issues with the exit key not being set.\n[not committed entirely, see below]]\n\n40552: space_logic.py (* fixed an error in space_logic.py *)\n\n40593:\nlaunch blenderplayer from ui not working in OSX fix - by Daniel Stokes and me\n\n\n\n########################################################\ncode left behind (to be included in next commit):\n########################################################\n\t\t{\n\t\t\t/* Initialize default values for collision masks */\n\t\t\tObject *ob;\n\t\t\tfor(ob=main->object.first; ob; ob=ob->id.next)\n\t\t\t\tob->col_group = ob->col_mask = 1;\n\t\t}\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42750 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"f1d2443542b164a8bb7cd169394eb9293343b7a6","author":{"email":"9347efe031ffa25a4ce48f90146278ae81f7c0b6@954f8c5b-7b00-dc11-b283-0030488c597c","name":"campbellbarton"},"url":"https://api.github.com/repos/sambler/myblender/commits/f1d2443542b164a8bb7cd169394eb9293343b7a6","message":"__str__ functions for other mathutils types\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42751 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"a9d3763c546e24727a772b837696120db1c6248e","author":{"email":"9347efe031ffa25a4ce48f90146278ae81f7c0b6@954f8c5b-7b00-dc11-b283-0030488c597c","name":"campbellbarton"},"url":"https://api.github.com/repos/sambler/myblender/commits/a9d3763c546e24727a772b837696120db1c6248e","message":"rename internal matrix struct member vars to avoid confusion\n\nMatrix.contigPtr --> matrix\nMatrix.row_size --> num_col\nMatrix.col_size --> num_row\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42752 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"95f8ffb908bc38475610c42929b50ff99195eb31","author":{"email":"9347efe031ffa25a4ce48f90146278ae81f7c0b6@954f8c5b-7b00-dc11-b283-0030488c597c","name":"campbellbarton"},"url":"https://api.github.com/repos/sambler/myblender/commits/95f8ffb908bc38475610c42929b50ff99195eb31","message":"patch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752\nfrom Andrew Hale\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42754 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"a29e7398bb698e029e181b7e5d476dc94b7da703","author":{"email":"073236222d03ef34e79a2fc5867e982cf3626342@954f8c5b-7b00-dc11-b283-0030488c597c","name":"dingto"},"url":"https://api.github.com/repos/sambler/myblender/commits/a29e7398bb698e029e181b7e5d476dc94b7da703","message":"First fix after Cucumber merge starts.\n* Restore COMPAT_ENGINES for particle panel, caused error on startup. (Cycles needs it) \n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42755 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"d09028638686ad379292c55931cc4a058d641f04","author":{"email":"633ec8df516dc600cd13f47e76085b72ab898cd2@954f8c5b-7b00-dc11-b283-0030488c597c","name":"kupoman"},"url":"https://api.github.com/repos/sambler/myblender/commits/d09028638686ad379292c55931cc4a058d641f04","message":"Cleaning up some issues that found their way into the python ui files with the first Cucumber merge.\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42757 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"0ae8f2544df2d7bef7ebf0773883c32668586432","author":{"email":"7bfa6fa30dcb891e639a8a022ae821783367c3a1@954f8c5b-7b00-dc11-b283-0030488c597c","name":"nazgul"},"url":"https://api.github.com/repos/sambler/myblender/commits/0ae8f2544df2d7bef7ebf0773883c32668586432","message":"Get rid of hardcoded structure definition in DM drawing callbacks\n\nStructures passing to DM callbacks as userData used to be defined in both callee\nand callbacks itself which made it difficult and unsafe to add new properties\nto user data.\n\nAdded typedefs for this structures and use them in callbacks and callee functions.\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42759 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"37145c51aff627ed1f5a131be14993d64ec8fa42","author":{"email":"9e4bd027f55486bc01eb5c3e7f889479826c89f5@Shaneware.Biz","name":"SAmbler"},"url":"https://api.github.com/repos/sambler/myblender/commits/37145c51aff627ed1f5a131be14993d64ec8fa42","message":"Merge remote-tracking branch 'remotes/trunk'\n\n* remotes/trunk: (60 commits)\n  Get rid of hardcoded structure definition in DM drawing callbacks\n  Cleaning up some issues that found their way into the python ui files with the first Cucumber merge.\n  First fix after Cucumber merge starts. * Restore COMPAT_ENGINES for particle panel, caused error on startup. (Cycles needs it)\n  patch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752 from Andrew Hale\n  rename internal matrix struct member vars to avoid confusion\n  __str__ functions for other mathutils types\n  Cucumber, first batch of merge - UI changes and custom exit key --------------------------------------------------------------- This was a test drive to see how painful the merge will be. Next batches are: - use desktop option for fullscreen - multisampling option - bullet collision mask - python - storage (vbo, dl, ...) - lighting\n  SVN maintenance.\n  patch [#29651] Add a __str__ Method to Matutils Matrices so print(matrix) Shows Columns as Columns from Andrew Hale\n  minor edits to previous commit & set VKey to toggle vertex select in weight paint mode.\n  unit test for mathutils python module from Andrew Hale, runs in CTest too\n  Patch #27085, Restore old 2.49 TAB behaviour for window splitting, by Andre Oliveira\n  patch [#28094] New equirectangular world texture mapping option\n  calculate weight paint colors once per vertex rather then on every face corner (was doing the same deform vert lookup and color calculation multiple times per vertex),\n  * Changes for static win32 png libs.\n  * Fix for moving mingw png libs.\n  Fix #29653: fix wrong cycles depth of field distance when rendering with a scaled camera.\n  Fix #29655: keyboard shortcuts missing from text editor text menu, and removed confirmation popup for creating new text datablock.\n  OS X: add BLENDER_SOFTWAREGL environment variable to force using software OpenGL renderer, for debugging OpenGL issues.\n  Much cleaner and satisfying code in weightvg modifiers' \"init\": copy only the CD_DEFORMVERT data layer (if it's the org one), and not the whole DerivedMesh!\n  ..."},{"sha":"7d64acb775ea7d3ccc978378113826f96a643074","author":{"email":"9e4bd027f55486bc01eb5c3e7f889479826c89f5@Shaneware.Biz","name":"SAmbler"},"url":"https://api.github.com/repos/sambler/myblender/commits/7d64acb775ea7d3ccc978378113826f96a643074","message":"update addon scripts"},{"sha":"1ad88b668473678ec3b7ad474344e803eb2fb2de","author":{"email":"9e4bd027f55486bc01eb5c3e7f889479826c89f5@Shaneware.Biz","name":"SAmbler"},"url":"https://api.github.com/repos/sambler/myblender/commits/1ad88b668473678ec3b7ad474344e803eb2fb2de","message":"update addon_contrib scripts"},{"sha":"4c81b96be56295382de6e845daf9aef0eb5e4cff","author":{"email":"9e4bd027f55486bc01eb5c3e7f889479826c89f5@Shaneware.Biz","name":"SAmbler"},"url":"https://api.github.com/repos/sambler/myblender/commits/4c81b96be56295382de6e845daf9aef0eb5e4cff","message":"svn update"},{"sha":"58a6215278d7b67fda6b1bc7595315d00f54c24c","author":{"email":"643c86ceb8f3f506b8a0955fe313aae712e6787d@954f8c5b-7b00-dc11-b283-0030488c597c","name":"mont29"},"url":"https://api.github.com/repos/sambler/myblender/commits/58a6215278d7b67fda6b1bc7595315d00f54c24c","message":"Fix a small typo-bug in UVProject modifier (using v3 instead of v4 to detect tri/quad faces). Seems it was harmless, though...\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42760 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"19695dcd744b294c940aa313cfea3dcf1dd69543","author":{"email":"9347efe031ffa25a4ce48f90146278ae81f7c0b6@954f8c5b-7b00-dc11-b283-0030488c597c","name":"campbellbarton"},"url":"https://api.github.com/repos/sambler/myblender/commits/19695dcd744b294c940aa313cfea3dcf1dd69543","message":"move topology mirror out into its own functions - needed for bmesh branch so we can use then for bmeshes own internal mirror calculations.\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42761 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"14e22a64813dc6cdf48c7e97f72f7137091ce341","author":{"email":"9347efe031ffa25a4ce48f90146278ae81f7c0b6@954f8c5b-7b00-dc11-b283-0030488c597c","name":"campbellbarton"},"url":"https://api.github.com/repos/sambler/myblender/commits/14e22a64813dc6cdf48c7e97f72f7137091ce341","message":"recent commit missed swapping args for MATRIX_ITEM in mathutils_Vector.c, breaking matrix*vector.\n\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42763 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"b2751b0fa3894454b43f5c5faefbda8b36427b59","author":{"email":"65212035701e5810f13ac3fb74947aa41bacc6d9@954f8c5b-7b00-dc11-b283-0030488c597c","name":"blendix"},"url":"https://api.github.com/repos/sambler/myblender/commits/b2751b0fa3894454b43f5c5faefbda8b36427b59","message":"Fix #25775: crash using border render from external render engines, merging\nback the tile used wrong offsets.\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42764 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"67a718b1e09d14119560e514a9d86a80a37ba472","author":{"email":"65212035701e5810f13ac3fb74947aa41bacc6d9@954f8c5b-7b00-dc11-b283-0030488c597c","name":"blendix"},"url":"https://api.github.com/repos/sambler/myblender/commits/67a718b1e09d14119560e514a9d86a80a37ba472","message":"Cycles: border rendering support, includes some refactoring in how pixels are\naccessed on devices.\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42765 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"e8904488ab46ca946e4b13cccc7233bf538c39aa","author":{"email":"65212035701e5810f13ac3fb74947aa41bacc6d9@954f8c5b-7b00-dc11-b283-0030488c597c","name":"blendix"},"url":"https://api.github.com/repos/sambler/myblender/commits/e8904488ab46ca946e4b13cccc7233bf538c39aa","message":"Cycles: avoid using float3 in kernel constant memory, just so we're sure alignment\nis working compatible between cpu and gpu.\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42766 954f8c5b-7b00-dc11-b283-0030488c597c"},{"sha":"7f3685d9ee98e00e8d191c1c4af856a6394fc9a6","author":{"email":"643c86ceb8f3f506b8a0955fe313aae712e6787d@954f8c5b-7b00-dc11-b283-0030488c597c","name":"mont29"},"url":"https://api.github.com/repos/sambler/myblender/commits/7f3685d9ee98e00e8d191c1c4af856a6394fc9a6","message":"New modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting CustomData layers only (e.g. UVProject and  WeightVG ones).\n\nAlso, allow applying to obdata those modifiers, even with shapekeys, but do not allow applying them *as* shapekey (as shapekeys do not have CD layers).\n\nFix [#29636] Vertex Weight Mix modifier \"apply\" button don't work.\n\nNote: applying whit shape keys currently always uses base shape, not current one (for apply to obdata as well as apply to shapekey), but this is another topic...\n\ngit-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@42769 954f8c5b-7b00-dc11-b283-0030488c597c"}],"head":"efa4546657a8dd82b6d243b21443254e5e5a6cbe","size":150}