Commit Graph

4909 Commits

Author SHA1 Message Date
Jens Verwiebe
a664e779ac OSX: make ZOOM-gesture on trackpads half the speed, added comment for experimental all-time-trackpad assumption 2011-10-31 12:31:48 +00:00
Brecht Van Lommel
bb379c06e9 Cycles: progress printing in background mode, print finished at the end and
avoid duplicate prints.
2011-10-30 10:12:34 +00:00
Campbell Barton
bd86ba2c88 svn merge -r41335:41371 2011-10-30 01:27:49 +00:00
Thomas Dinges
f837b46a2b Modifier compilation tweaks (Blender conference commit)
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons) 

* Add support for scons to disable build with Decimate and Boolean modifier. 
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-29 23:56:07 +00:00
Brecht Van Lommel
238f3a7d34 Cycles: seed value to get different noise values from renders, there was a patch
for this but I've implemented it differently.
2011-10-29 14:27:24 +00:00
Campbell Barton
ff837cbe9b svn merge -r41310:41329 ^/trunk/blender 2011-10-28 05:17:09 +00:00
Jens Verwiebe
4ce5bb0ba2 OSX: adapt comments to new behaviour when compiling with gcc-4.6 but GHOST and QT with default compiler 2011-10-27 15:50:51 +00:00
Jens Verwiebe
7a20ced627 Fix player prototype, fix compile for OSX/XCode4.2, use always tablet enabled (test) 2011-10-27 15:46:26 +00:00
Campbell Barton
699030ceb6 use const for readonly strings and set some functions to static 2011-10-27 14:41:26 +00:00
Campbell Barton
75e570b2b7 svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk 2011-10-27 09:42:03 +00:00
Campbell Barton
c936c61bac tweak remove_strict_flags so it can be used with gcc's -Wall 2011-10-27 07:26:41 +00:00
Campbell Barton
94f8e3198d svn merge -r41266:41287 ^/trunk/blender 2011-10-26 03:26:52 +00:00
Sergey Sharybin
fe6ad36060 Fix compilation error for win32.
That static align trick i've wrote about is still necessary.
2011-10-25 18:13:12 +00:00
Campbell Barton
8732ae3a0b edits to cmake 2011-10-25 13:41:43 +00:00
Sergey Sharybin
3d903ee3ff Libraries upgrade:
- Upgrade Eigen2 library to Eigen3
- Upgrade colamd library and placed in extern/ so other libraries from extern/ can use it

NOTE: With previous version of Eigen (3.0.1) it was necessary to define
      EIGEN_DONT_ALIGN_STATICALLY macro to make it compilable on windows 32bit.
      After latest upgrade it seems to be unnecessary (at least when was testing libmv),
      so i removed that defines which can reduce speed and lead to other problems.
2011-10-25 12:37:42 +00:00
Campbell Barton
da8a7928c9 svn merge ^/trunk/blender -r41230:41266 2011-10-24 23:06:27 +00:00
Brecht Van Lommel
47463742e2 Cycles: svn merge -r41232:41266 ^/trunk/blender 2011-10-24 22:51:44 +00:00
Brecht Van Lommel
4cd1e6337e Cycles: svn merge -r41225:41232 ^/trunk/blender 2011-10-24 22:32:00 +00:00
Campbell Barton
685b6e7db9 svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full 2011-10-24 22:18:32 +00:00
Brecht Van Lommel
55ab66b455 Cycles: svn merge -r41205:41225 ^/trunk/blender 2011-10-24 20:19:04 +00:00
Brecht Van Lommel
05334492a3 Cycles: theme changes, some code syncing with trunk. 2011-10-24 19:32:10 +00:00
Campbell Barton
15e6d6cd75 svn merge ^/trunk/blender -r41226:41227 . 2011-10-24 12:43:08 +00:00
Campbell Barton
70bf00a74c svn merge ^/trunk/blender -r41200:41226 . 2011-10-24 08:45:55 +00:00
Campbell Barton
ad1d3dd30f svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after 2011-10-24 07:56:42 +00:00
Campbell Barton
77a7ec7c61 svn merge ^/trunk/blender -r41150:41175 2011-10-24 05:00:53 +00:00
Campbell Barton
0503a4f7a6 svn merge ^/trunk/blender -r41100:41150 2011-10-24 04:18:28 +00:00
Bastien Montagne
c49cdf5eec Another set of UI messages fixes and tweaks! No functional changes. 2011-10-23 19:54:06 +00:00
Bastien Montagne
8a6a3dbb54 Fix for commit 41227 (Some opening comment tags (/*) were lost!). 2011-10-23 19:39:20 +00:00
Guillermo S. Romero
82c84f4b58 Remove some more $Id$ that still were left after r41227 and r41228. 2011-10-23 19:01:59 +00:00
Guillermo S. Romero
6105199668 Remove the svn:keywords property. 2011-10-23 18:38:16 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Campbell Barton
67e744ccf0 fix some typo's 2011-10-23 15:27:36 +00:00
Brecht Van Lommel
2bfd10131e Cycles: svn merge -r41182:41205 ^/trunk/blender 2011-10-22 19:06:41 +00:00
Brecht Van Lommel
586c631c88 Cycles: when creating nodes from a blender material, set the diffuse color in
the diffuse node, similar for lamps and world.
2011-10-22 18:51:45 +00:00
Joerg Mueller
726fa61817 Fix for an unhandled exception. Campbell: please include in 2.60a. 2011-10-22 18:08:26 +00:00
Dalai Felinto
cac4fde224 utf8 OSX - cleanup
I still think utf8_buf can be 5 (4 bytes + '\0'), but even 6 may not be enough to what is coming next (NFC - precomposedStringWithCanonicalMapping)
incorporating ascii as a subset of utf8. I don't think we need to re-encode it.
U+0000 ~ U+00FF - latin1 set
2011-10-22 09:28:10 +00:00
Alexander Kuznetsov
be61044eee Fix for text object on windows.
No utf8 when keyup
2011-10-22 03:14:19 +00:00
Campbell Barton
74017cb020 header cleanup and typo's 2011-10-22 01:53:35 +00:00
Brecht Van Lommel
9adfa289e8 Cycles: svn merge -r41157:41182 ^/trunk/blender 2011-10-21 20:26:54 +00:00
Brecht Van Lommel
10af15b85b Cycles: svn merge -r40934:41157 ^/trunk/blender 2011-10-21 20:13:12 +00:00
Dalai Felinto
932aa116df utf8 OSX - disabling utf8 at KeyUp, otherwise TextObject doesn't work.
This bug is also present in Windows, so I believe the real bug is in Linux (and in the text object input).

Also Cmd+C and Cmd+v doesn't work for utf8 yet.
2011-10-21 19:09:14 +00:00
Alexander Kuznetsov
c9035e20d0 UTF8 input support for Windows.
ToDo:
* add support for dead keys
* other input methods (for hieroglyphs)
2011-10-21 17:40:35 +00:00
Dalai Felinto
f9f5daed9b disabling utf8 for OSX. It's not working 100% and it's breaking other things 2011-10-21 06:45:08 +00:00
Campbell Barton
d37760bc34 cleanup scons build flags, many duplicates because because of confusion between CFLAGS/CPPFLAGS/CCFLAGS/CXXFLAGS, devs would set multiple to be on the safe side.
- defines go in CPPFLAGS
- C & C++ flags go in CCFLAGS
- CFLAGS / CXXFLAGS are C OR C++ only.

also commented intended ghost unicode/ascii usage.
2011-10-21 04:23:26 +00:00
Jens Verwiebe
36017e2af9 OSX: dalai's patch for utf8 support, todo: uppercase chars not working yet 2011-10-20 10:35:54 +00:00
Joerg Mueller
3a51a446c1 Fix for 7.1 audio export being misscalculated... 2011-10-20 07:03:08 +00:00
Dalai Felinto
e0604e5941 OSX fix for recent utf8 commit 2011-10-20 06:29:14 +00:00
Campbell Barton
9bbec84e7e initial support for unicode keyboard input for ghost & blenders WM.
- currently X11 only, depends on Xinput (but should not break other os's).
- ghost stores utf8 buffer, copies to wmEvent's
- UI text input is currently the only area that uses this - not console or text editor.
- no rna access yet.
2011-10-20 05:30:26 +00:00
Brecht Van Lommel
72e47de8b5 Cycles: fix some issues with mix shaders when the weight for an emission shader
was 0.0, and background shader mix wasn't working.
2011-10-19 00:13:41 +00:00
Campbell Barton
638a93b235 svn merge ^/trunk/blender -r41075:41099 2011-10-18 01:09:00 +00:00