e59ab6486f
svn merge -r41751:41779 ^/trunk/blender
2011-11-15 02:05:32 +00:00
e84c0980a3
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
121ff4223d
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
2011-11-10 04:17:43 +00:00
58f3503e90
Fix #29201 : movie clip editor - right click crashes blender
...
Just another not very smart check for "boundary" case of usecase.
2011-11-08 16:09:20 +00:00
cb890a49fb
svn merge ^/trunk/blender -r41602:41638 .
2011-11-08 02:57:28 +00:00
27d42c63d9
Camera tracking integration
...
===========================
Commiting camera tracking integration gsoc project into trunk.
This commit includes:
- Bundled version of libmv library (with some changes against official repo,
re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
clips (both of movie files and image sequences) and doing camera/motion
tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
stuff only, but which can be easily extended to work with masks too.
This editor supports:
* Loading movie files/image sequences
* Build proxies with different size for loaded movie clip, also supports
building undistorted proxies to increase speed of playback in
undistorted mode.
* Manual lens distortion mode calibration using grid and grease pencil
* Supervised 2D tracking using two different algorithms KLT and SAD.
* Basic algorithm for feature detection
* Camera motion solving. scene orientation
- New constraints to "link" scene objects with solved motions from clip:
* Follow Track (make object follow 2D motion of track with given name
or parent object to reconstructed 3D position of track)
* Camera Solver to make camera moving in the same way as reconstructed camera
This commit NOT includes changes from tomato branch:
- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
(need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
readability and understanadability of code. Better to make this chaneg when
Keir will finish his current patch.
More details about this project can be found on this page:
http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011
Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.
2011-11-07 12:55:18 +00:00
7508540c53
svn merge -r41575:41602 ^/trunk/blender
2011-11-07 07:01:24 +00:00
7c88bc5952
replace macros for bli math functions in editors
2011-11-06 16:34:44 +00:00
85e0609c54
use char for BMHeader type and flag (saves 2 bytes per edge/loop/vertex/face)
...
also found mouse_mesh_shortest_path was casting edit selecton to the wrong type.
2011-11-01 14:36:23 +00:00
a1e95e2e18
replace as many uses of BM_Get/SetIndex as possible with tagging with a temp flag, some uses need index values to be set, so this will need more effort to replace (crazy space and solidify for eg).
2011-11-01 12:51:38 +00:00
b6e445a61f
BMesh todo - mirror vertex groups back.
2011-11-01 05:43:35 +00:00
e9429f45e5
re-enable mirroring - it was commented in a few functions.
2011-10-28 14:31:15 +00:00
0701982933
svn merge -r41329:41335 ^/trunk/blender
2011-10-28 12:57:37 +00:00
0d63bb005f
replace VECCOPY and QUATCOPY with inline funcs.
2011-10-28 12:40:15 +00:00
74004631a1
workaround for createTransEditVerts overwriting index data to fix mirror.
2011-10-26 10:04:10 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
70bf00a74c
svn merge ^/trunk/blender -r41200:41226 .
2011-10-24 08:45:55 +00:00
0503a4f7a6
svn merge ^/trunk/blender -r41100:41150
2011-10-24 04:18:28 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
e58eb5db6f
use defines for keying set names to avoid confusing them with text and having some incorrect names (as fixed in last commit)
2011-10-23 05:08:02 +00:00
6c9362a2ea
fix for incorrect keying set names 'Scale' vs 'Scaling', where 'Scale' was hard coded in auto keyframe when 'Only Insert Needed' option was enabled and would always fail to return a keying set.
...
- to be included in 2.60a.
2011-10-23 04:48:13 +00:00
8e58fceab1
Bugfix [ #28976 ] crash when moving keys in dopesheet editor
2011-10-20 05:18:02 +00:00
5ae7a91eb3
Fix a memory leak when attempting edge slide with no edges selected
2011-10-10 14:35:33 +00:00
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
8695bedda2
svn merge ^/trunk/blender -r40644:40720
2011-10-06 16:59:58 +00:00
275093324f
fix [ #28023 ] VSE: Transform Markers doesn't do anything
...
- renamed to 'Sync Markers' to match action editor.
- action editor option was broken in the same way as the sequencer.
2011-10-03 02:49:08 +00:00
74c681330f
fix [ #28788 ] Scale using "Individual origins" in bones
...
works for rotate and scale
2011-10-02 19:57:34 +00:00
ceb81b1960
no-longer select handles when transforming in the dopesheet since now the dope sheet acts as if handles are hidden.
...
also remove invalid comment.
2011-09-29 06:13:25 +00:00
5bbd0decfd
fix [ #28765 ] keyframe handles do not move with curves in graph editor when hidden, resulting in bad curves.
...
hide handles wasn't properly respected by transform function testhandles_fcurve().
2011-09-29 05:03:21 +00:00
c8b0d25794
fix [ #28158 ] Image crop keyframes/fcurves do not 'stick' to strip
2011-09-28 10:05:56 +00:00
450ea01002
transform sequencer update was checking against the wrong transform mode.
2011-09-28 09:47:30 +00:00
effea8c29b
svn merge ^/trunk/blender -r40511:40587
2011-09-27 03:12:31 +00:00
f0cceedd7a
Fix #28747 : Crash in Node Editor
...
Setting of transform flags happened with NULL edittree
2011-09-26 08:51:02 +00:00
274b9c8fb8
whitespace cleanup
2011-09-25 12:31:21 +00:00
9494340dae
svn merge ^/trunk/blender -r40432:40491
2011-09-23 13:04:01 +00:00
d92b5ea04a
svn merge ^/trunk/blender -r40390:40394
2011-09-23 07:20:27 +00:00
ea4b3fee1f
svn merge ^/trunk/blender -r40389:r40390
2011-09-23 07:17:07 +00:00
049c18405a
svn merge ^/trunk/blender -r40382:r40389
2011-09-23 06:43:06 +00:00
1ca02a8d29
Fix rest of #28693 : Proportional edit hangs on mesh object with high scale
...
Patchy by Juha Maki-Kanto
2011-09-22 15:46:34 +00:00
14475d07cd
svn merge -r40295:40367 ^/trunk/blender
2011-09-21 17:15:54 +00:00
78d4260144
committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking.
2011-09-20 10:15:57 +00:00
84d06f252e
tag & comment unused vars with /* UNUSED */
2011-09-20 08:48:48 +00:00
d321397930
fix from Juha Mäki-Kanto (kanttori), was calculating connectivity data when proportional editmode was enabled, even if connectivity setting was off.
2011-09-20 06:47:43 +00:00
f157a543c6
/blender/editors: Removed final points in UI strings and messages.
...
Plus a few cuts in very long lines…
2011-09-19 12:26:20 +00:00
1ff373ef5b
svn merge -r40166:40279 ^/trunk/blender
2011-09-17 04:59:14 +00:00
1741269d30
resolve bad level calls from blenkenel/ into editors/ & remove editors from the include path from CMake & SCons.
...
* ED_curve_editnurbs --> curve_editnurbs
* ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-14 00:37:27 +00:00
d48ee9d035
Submit of patch [ #28568 ] BMesh: make active element highlights work
2011-09-13 13:41:20 +00:00
fddc655aec
svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 04:57:20 +00:00
4bd0a2ba2d
replace VECCOPY -> copy_v3_v3, added copy_v*_v*_short too for typesafe copying, some parts of the code are copying float -> short normals without scaling. fix coming next.
2011-09-12 04:14:12 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
