Commit Graph

1504 Commits

Author SHA1 Message Date
Sergey Sharybin
33e829819e Camera tracking integration
===========================

Commiting VSE-proxies patch from Peter Schlaile.

Description is here: http://lists.blender.org/pipermail/bf-committers/2011-May/032152.html
Git commit hash: baaecf244b83c70cb57e1bf6fdd51dd8591bde5b
2011-08-08 12:18:20 +00:00
Sergey Sharybin
b49d6a6f60 Merging r39135 through r39172 from trunk into soc-2011-tomato 2011-08-08 07:14:59 +00:00
Campbell Barton
8eec116d0e add missing keys for ghost/sdl 2011-08-08 06:54:07 +00:00
Campbell Barton
0160901c90 - update X3D and FBX testing checksums
- building with GHOST/SDL now adds the PREFIX
- image.external_edit operator errors out if the filepath isnt set (was annoying and loaded gimp while running tests)
2011-08-08 03:31:25 +00:00
Campbell Barton
5681380db0 simplify x11 path code, had unneeded NULL checks and std namespace 2011-08-07 17:38:36 +00:00
Mike Erwin
479c203dad stricter WITH_INPUT_NDOF guards, general cleanup 2011-08-07 16:44:10 +00:00
Sergey Sharybin
0bb5f21655 Merging r39102 through r39120 from trunk into soc-2011-tomato 2011-08-07 08:56:13 +00:00
Mike Erwin
6c821f4078 stricter NDOF guards for Windows (forgot in earlier commit) 2011-08-06 23:13:36 +00:00
Sergey Sharybin
462670b845 Merging r39050 through r39101 from trunk into soc-2011-tomato 2011-08-06 14:52:45 +00:00
Campbell Barton
4d319f8059 fix for GHOST/SDL key input with uppercase keys. 2011-08-05 17:39:44 +00:00
Sergey Sharybin
ec5a7d6206 Merging r38993 through r39028 from trunk into sox-2011-tomato 2011-08-04 16:52:26 +00:00
Mike Erwin
a6fed14da4 stricter guards for disabling NDOF code (will test in 3.. 2.. 1..) 2011-08-04 03:14:00 +00:00
Sergey Sharybin
3129072522 Merging r38951 through r38987 from trunk into soc-2011-tomato 2011-08-03 14:02:08 +00:00
Sergey Sharybin
d4909c5628 - Do not add GHOST_NDOFManager.cpp to list of sources if
NDOF is disabled in CMake.
- Added "default" section to switch in sendMotionEvent.
  It's what strict gcc rules don't like much and it's
  And it's good practice in general, imo.
2011-08-03 07:30:24 +00:00
Nathan Letwory
02ab2b473c Debug print removed. 2011-08-03 07:08:28 +00:00
Mike Erwin
3b541b259f removed attempted WITH_BF_3DMOUSE detection, fixed just one indention (left the others in their ugly new state) 2011-08-03 06:42:55 +00:00
Campbell Barton
6c9d0f2b7a whitespace edits. 2011-08-03 06:27:44 +00:00
Mike Erwin
6233430c23 compensate for lack of 3D mouse calibration on Windows 2011-08-03 05:01:55 +00:00
Sergey Sharybin
607e3eefb8 Merging r38941 through r38950 from trunk into sox-2011-tomato 2011-08-02 18:28:05 +00:00
Sergey Sharybin
13eefec9dd More flexible configuration for 3dmouse library for scons.
Needed for release environment and buildbot.

Buildbot rules would be updated with next commit after
environment will be tested.
2011-08-02 17:59:43 +00:00
Sergey Sharybin
1694e5978a Merging r38898 through r38940 from trunk into soc-2011-tomato 2011-08-02 17:32:19 +00:00
Nathan Letwory
222190c618 typo fix 2011-08-02 14:45:35 +00:00
Nathan Letwory
7561d10c2e Don't include NDOF files when disabled. 2011-08-02 10:50:22 +00:00
Nathan Letwory
467475590e Some more silencing. Enable with BF_GHOST_DEBUG 2011-08-02 10:39:46 +00:00
Nathan Letwory
6bc101fa7e Indentation changes 2011-08-02 10:26:20 +00:00
Nathan Letwory
69b4962fc0 Properly disable NDOF code when WITH_INPUT_NDOF is not define. 2011-08-02 10:20:47 +00:00
Nathan Letwory
c1cf646bb7 whitespace 2011-08-02 09:36:44 +00:00
Nathan Letwory
1828e37794 Turn off ndof button debug 2011-08-02 09:09:07 +00:00
Nathan Letwory
28ed1b6745 tabs -> spaces 2011-08-02 09:07:24 +00:00
Jiri Hnidek
2e860a3e85 - Blender could be build with scons again. 2011-08-02 07:02:40 +00:00
Campbell Barton
baa37b1b46 more cmake/x11 edits
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.
2011-08-02 06:32:53 +00:00
Campbell Barton
fcd7d2b486 NDOF related edits
- fix for building without NDOF on X11
- quiet some warnings
2011-08-02 05:52:27 +00:00
Guillermo S. Romero
8f3016098d SVN maintenance. 2011-08-02 05:31:32 +00:00
Mike Erwin
56918978b7 3D mouse support from merwin-spacenav branch 2011-08-02 04:28:05 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Sergey Sharybin
e9b3225b8d Merging r38832 through r38897 from trunk into soc-2011-tomato 2011-08-01 15:24:15 +00:00
Mike Erwin
19b38034f9 support for older SpacePilot (sans Pro), minor tidying 2011-07-31 22:59:36 +00:00
Alexander Kuznetsov
6e788c37df Hides console on win32 even if python path is 2 or more lines
Adding tlhelp32.h header
2011-07-30 19:09:34 +00:00
Ton Roosendaal
681b26a48e Bugfix #28109
Old issue with OSX Cocoa code: shift+scrollwheel should send
a 'horizontal wheel' event to Blender. Blender only recognizes
scroll events in general though. The old code then just didn't
send an event at all, not passing on shift+scrolls.

Now the scroll event is sent anyway, relying on Blender's
keymapping to define what to do with shift+scroll.

This fixes things like shift+scroll to scale ListBox widgets.
2011-07-30 10:14:50 +00:00
Sergey Sharybin
b6b4164a70 Merging r38819 through r38831 from trunk into soc-2011-tomato 2011-07-29 21:14:20 +00:00
Alexander Kuznetsov
6b987910e4 Patch [#27925] by Andrew Cox and me
Modifier key sticks after Alt-tab on Win32
2011-07-29 20:21:37 +00:00
Sergey Sharybin
84d350f4b5 Camera tracking integration
===========================

Attempt to switch moviecache to use CacheLimiter.

Some changes in limiter were necessary:
- Limiter counted mapped memory twice when was chacking
  how many memory is used.
- It was using "global" memory usage not memory usage by
  cached elements. It will cause big problems when there's
  large mesh or plenty of undo steps are in memory nothing
  would be cached in sequencer.
- To solve this problem introduced "callback" to measure
  cached element size. It could be not very accurate in general,
  but it works well for image buffers. And if this callback
  isn't set old-school memory usage check would be used.
- The whole cache used to get freed when memory limit exceeded,
  now it'll drop only as much elements as necessary to reduce
  memory usage.

Sequence cache wasn't switched to use moviecache but
now it's really easy to do. When i'll be sure new caching
scheme works fine.

Now clip editor uses as much memory for cache as it's set in
User Preferences (Preferences -> System -> Sequencer -> Memory
Cache Limit) which si 128Mb by default. Please do not complain
about few cached frames out-of-box and just increase limit
there. Caching fixed amount of frames wasn't so nice indeed.
2011-07-27 12:53:39 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Mike Erwin
c2c62134cc minor cleanup of Mac ndof manager 2011-07-24 00:52:18 +00:00
Mike Erwin
5fae765187 more cautious device detection, minor cleanup 2011-07-23 21:29:19 +00:00
Sergey Sharybin
75dd7aad75 Merging r38615 through r38636 from trunk into soc-2011-tomato 2011-07-23 18:42:58 +00:00
Joerg Mueller
f4a30e473b Cherry pick merge: /branches/soc-2011-pepper/intern/audaspace/OpenAL:r38630
Original log: Corrected the OpenAL device's threading code. This is a bugfix for #27913, thanks to Juha Mäki-Kanto for helping to resolve this.
2011-07-23 16:08:37 +00:00
Nathan Letwory
8c5f028f4a Fix compile error due to faulty merge. 2011-07-22 14:13:28 +00:00
Nathan Letwory
b326a6841e Simple ifndef guards, so we don't get redefines. 2011-07-21 20:54:47 +00:00
Nathan Letwory
eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00