07dee0d8a6
Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk
2011-06-21 15:47:18 +00:00
207911bdb3
Merge with trunk r37677
2011-06-20 22:55:18 +00:00
015b0ea00a
small fix to turntable mode, first attempt at trackball code, ndof now respects view locking and updates 'User Persp' etc.
2011-06-20 01:54:49 +00:00
85051eff69
disabled debug logging now that a workaround is in place (Win32 ndof buttons)
2011-06-18 20:32:14 +00:00
412da91a47
SpacePilotPro has 31 buttons, not 29 -- '+' and '-' work again
2011-06-18 19:40:30 +00:00
598c54f0e9
ndof device detection on Windows, safer button handling
2011-06-18 16:50:54 +00:00
968b2a8afb
rename cmake include/libraries to conform with suggested cmake names
2011-06-18 14:12:54 +00:00
549c2c58a1
added FindSndFile cmake module to replace inline checks.
2011-06-18 12:12:19 +00:00
ebc2f7064d
tiny fix for Linux
2011-06-17 22:45:33 +00:00
56e312a88e
filled out USB product IDs for all 3Dconnexion devices
2011-06-17 22:19:16 +00:00
d53801e8f6
updated Mac code to work with latest 3Dx beta driver -- all buttons work now
2011-06-17 21:04:23 +00:00
e7591d177b
finished Mac NDOF device detection, moved core device ID to base NDOFManager, clarified info/error messages
2011-06-17 19:48:26 +00:00
b13e12a7bb
NDOF device detection on Mac -- phase 1
2011-06-17 16:10:06 +00:00
7adc3b6029
Cycles: compile error fix for ICC.
2011-06-17 11:33:57 +00:00
18b5dac5ca
Standard views (front, top, etc.) work from buttons on SpaceExplorer and SpacePilotPro. Linux can now determine which NDOF device is plugged in.
2011-06-16 19:45:38 +00:00
a90d30c863
3D Audio GSoC:
...
GameEngine Python access sound actuator's sound (with setting! :-D).
2011-06-16 09:13:29 +00:00
d7ef491845
cleaned up event logging, added HID -> function table for SpacePilot PRO
2011-06-15 20:56:42 +00:00
d5cafb808f
fixed typos, renamed the HID -> function lookup tables
2011-06-15 19:57:10 +00:00
060e2b295b
mapping HID button codes -> functions, for SpaceNavigator and SpaceExplorer
2011-06-15 19:45:00 +00:00
49f7a4d8f8
3D Audio GSoC:
...
Temporary fix for MSVC.
2011-06-15 18:52:52 +00:00
04584806cc
handle up to 32 buttons (up from 16), for SpacePilot PRO
2011-06-15 16:05:10 +00:00
6aa7777144
removed temporary debug logging
2011-06-15 02:40:25 +00:00
f8212f4e03
3D Audio GSoC:
...
Removing unneeded const from Factory::createReader.
2011-06-14 21:22:22 +00:00
a5c6f3d53b
Cycles: more work on texturing UI, now texture nodes use same nodes as shading,
...
only rough implementation for design proposal.
2011-06-14 16:05:21 +00:00
d8974a60f6
3D Audio GSoC:
...
Changed Readers to top-down architecture instead of bottom-up.
2011-06-14 12:13:19 +00:00
8ff0c2e107
Merge with trunk r37475.
2011-06-14 12:06:21 +00:00
5745f99dee
Elbeem / Fluidsim update:
...
a) Enable the possibility to remove the "air bubble" around submerged collision object. This feature is enabled as standard for new files. The code was found in elbeem by nudelZ, coded and provided by Nils Thürey (thanks!)
b) Old baked files gets deleted if a new bake gets started (were overwritten before and resulted in weird old bake + new bake mixture) (idea by nudelZ)
2011-06-12 23:51:30 +00:00
450f176a8f
split Win32 NDOF manager into 2 files to fix Mac scons build
2011-06-11 02:26:28 +00:00
6c7daf58be
one small change -- SpaceNav works on Windows
2011-06-11 00:58:49 +00:00
7b124242e7
SpaceNav works on Linux
2011-06-11 00:25:48 +00:00
30fb5710b6
Made WinXP or later required, SpaceNav (almost) working on Windows
2011-06-10 01:34:53 +00:00
c5e63925db
Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-06-09 14:53:25 +00:00
77c2266d7b
Cycles: texture tab in properties editor now shows dropdown for selecting
...
texture users in the context. It's only useful for modifiers and brushes
at the moment, not for shading nodes as using texture datablocks there is
not yet supported.
2011-06-08 23:36:06 +00:00
e75ff53452
migrated NDOF code from soc-2010-merwin, SpaceNavigator now works on Mac blender
2011-06-08 21:18:03 +00:00
ef5f78ecc7
3D Audio GSoC:
...
Making it possible to access blenders internal sounds via Python.
2011-06-05 22:06:29 +00:00
a79072c80d
SVN maintenance.
2011-06-05 00:10:20 +00:00
4a59928484
CMake option 'WITH_HEADLESS' to build blender in headless mode (no x11/xlib) with NULL ghost classe.
2011-06-04 14:12:55 +00:00
d1c542ce05
3D Audio GSoC:
...
Memory management improvements.
2011-06-03 23:28:57 +00:00
cd04cff180
Merge with trunk revision 37149.
2011-06-03 23:24:01 +00:00
966e004bbe
Cycles: OSL build & image manager fixes.
2011-05-31 16:21:30 +00:00
fc68daff58
Cycles: compile warning fixes.
2011-05-31 16:19:02 +00:00
64c2d5e90e
Cycles: more opencl fixes.
2011-05-31 11:31:00 +00:00
eedcba7ed5
Cycles: for material/world/lamps, if use_nodes is disabled, show some
...
default shaders instead of black.
2011-05-31 11:28:04 +00:00
e2f2626179
Cycles: fix crash syncing curve/text object with no verts/faces.
2011-05-31 11:12:42 +00:00
20746f6bb0
Cycles: fix instanced mesh sync being a bit too slow.
2011-05-31 10:57:43 +00:00
d404c31e8d
Cycles: fix sync issue with group instances.
2011-05-31 10:41:01 +00:00
6a128eee7b
Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-31 09:51:46 +00:00
89983a2187
Cycles: fix compile error for cycles_test.
2011-05-31 09:47:19 +00:00
b434550edc
fix for recent cmake changes
2011-05-31 09:27:33 +00:00
09da9d4393
cmake maintenance
...
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
