May 19, 2014, 10:30 (GMT) |
Added a few missing debug function stubs for release mode. |
May 19, 2014, 08:37 (GMT) |
Merge branch 'master' into depsgraph_refactor |
May 19, 2014, 08:00 (GMT) |
Merge remote-tracking branch 'origin/master' into soc-2014-cycles |
May 19, 2014, 07:12 (GMT) |
stub out binreloc |
May 19, 2014, 04:57 (GMT) |
Correction to the last merge |
May 18, 2014, 22:40 (GMT) |
Merge remote-tracking branch 'origin/master' into soc |
May 18, 2014, 22:34 (GMT) |
Moved Object->shapeflag to Key->pin Since we aren't going to use the shape key modifier for editmode blending, Apply Shape Keys in Editmode is now obsolete too, and shapeflag just says is the key is pinned or not. Why to do this? In editmode, we want to be able to switch from Blending shapekeys to pinned shapekeys and this is done in key RNA update handler, so we want it to be called when pinning changes. The RNA property was removed from the Object and added to the Key, all code that referenced Object->shapeflag now references Key->pin. The UI was updated to accomodate for that. Unrelated change which I couldn't stage seperately is that there is now support for temporary mix values from RNA and UI. The user can select which one to use in Editmode. The value in the UI will automatically reflect the editmix or the animation mix, transparent for the artist. |
May 18, 2014, 21:18 (GMT) |
Added an include guard to bmesh_pe.h |
May 18, 2014, 13:21 (GMT) |
Update Ceres to latest upstream version Brings new bounds limiting and also prepares build system for the changes in the upstream. Namely shared_ptr header and namespace is now being detected by a build system rather than by hacks in the code. |
May 18, 2014, 09:05 (GMT) |
Merge remote-tracking branch 'origin/master' into gtest-testing |
May 18, 2014, 08:46 (GMT) |
Add initial tests for path_utils |
May 18, 2014, 06:19 (GMT) |
Fix for linking tests |
May 17, 2014, 22:53 (GMT) |
Cleaned up mm2_hash() |
May 17, 2014, 22:49 (GMT) |
Removed a pointless assert and a bad totelem change from editdata_to_scratch |
May 17, 2014, 22:48 (GMT) |
Changed the topology hash function to Murmur2, hashing improved altogether. According to that [1], Murmur2 is faster and will work quite good in our situation. [1] http://floodyberry.com/noncryptohashzoo/ |
May 17, 2014, 20:55 (GMT) |
Fixed a dumb out-of-bounds on topology-changing keyblock recalc BKE_key_editdata_to_scratch didn't alloc space in the scratch if more verts were in the new mesh |
May 17, 2014, 12:07 (GMT) |
Extend unit tests collection - Cover Libmv with unit tests. We often hack into libmv from Blender side, so it's useful to have it covered here. - Added some round-trip tests for color space conversions. |
Revision c1515ce by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) May 17, 2014, 11:32 (GMT) |
compile fixes after merge |
Revision 21c06c4 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) May 17, 2014, 10:56 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim Conflicts: source/blender/blenkernel/intern/DerivedMesh.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenkernel/intern/smoke.c source/blender/editors/space_buttons/buttons_context.c |
May 16, 2014, 14:45 (GMT) |
Cycles: Use Bit Manipulation Instruction Sets in the AVX2 kernel, helps a bit as well. |
|
|
|


Master Commits
MiikaHweb | 2003-2021