Sergey Sharybin
20cea882d6
Merging r41037 through r41092 from trunk into soc-2011-tomato
2011-10-17 15:55:35 +00:00
Campbell Barton
61389bba41
fix spelling mistakes in comments (and in some python error messages), nothing to effect translations.
2011-10-17 06:39:13 +00:00
Sergey Sharybin
70c8e65021
Merging r40990 through r41036 from trunk into soc-2011-tomato
2011-10-15 19:19:24 +00:00
Joerg Mueller
9f6d67484c
Fix for [ #28916 ] 2.6 RC2 - Bake Sound to FCurve Crash
2011-10-14 16:58:21 +00:00
Joerg Mueller
9e17ecf010
Fixing [ #28907 ] Frozen playback.
...
Also fixing two more crashes when audio files don't exist/cannot be read and apply a changed file path of a sound, reported by Jens Verwiebe in IRC.
2011-10-13 22:19:29 +00:00
Sergey Sharybin
027e177905
Merging r40877 through r40911 from trunk into soc-2011-tomato
2011-10-10 15:24:31 +00:00
Joerg Mueller
9cabc57a62
Sequencer audio waveform drawing fix, now assured to be within the strip bounds.
2011-10-10 14:59:13 +00:00
Sergey Sharybin
f8b081153b
Merging r40653 through r40847 from trunk into soc-2011-tomato
2011-10-07 18:57:26 +00:00
Campbell Barton
f9ea19ac12
spaces -> tabs (only whitespace changes)
2011-10-06 22:02:50 +00:00
Campbell Barton
38221fa8e6
set mikktspace functions as static which are not used externally.
2011-10-06 11:40:49 +00:00
Campbell Barton
ce1ac3412d
dont define the ghost PREFIX for scons, since this means our portable downloadable binary would find the system blender files (if installed).
...
this should stay disabled until scons supports system/portable installs as with cmake.
2011-10-06 02:29:15 +00:00
Jens Verwiebe
39300a5079
OSX: Correct copy/paste error and exclude endianess switch from darwin
2011-10-05 08:58:32 +00:00
Joerg Mueller
4bafd13eaf
Missed some stoff when removing libsamplerate.
2011-10-02 18:08:16 +00:00
Nathan Letwory
1714d1cfe2
Typo fix. nexYon commit caused bit-loss in the word incs.
2011-10-02 17:58:21 +00:00
Joerg Mueller
07ad83a439
* Removing libsamplerate from build systems
...
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
2011-10-02 17:09:39 +00:00
Jens Verwiebe
b05a3f7e42
Cgange compile cindition for gcc-4.6-objC++ workaround
2011-09-30 20:26:14 +00:00
Brecht Van Lommel
9520295ade
Fix #28416 : setting fluid simulation start time to anything other than zero
...
gave wrong results. Note how in this code it already incremented to the start
time and then incorrectly added it again. Patch by Chris Foster, thanks!
2011-09-29 14:18:01 +00:00
Jens Verwiebe
47ca7e23c0
Now in proper english, hehe
2011-09-28 17:52:07 +00:00
Jens Verwiebe
ce714341b9
Using non ASCII-conform char in comment broke compile
2011-09-28 17:45:32 +00:00
Jens Verwiebe
6088d460ef
OSX: Give clear commenting and more up-to-date defaults
2011-09-28 17:28:37 +00:00
Jens Verwiebe
416885aad4
OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple compilers
2011-09-28 17:15:28 +00:00
Sergey Sharybin
78c7ec6401
Merging r40615 through r40652 from trunk into soc-2011-tomato
2011-09-28 10:45:39 +00:00
Joerg Mueller
c2323749ff
Bugfix for wrong playback reported by Sergey Sharybin in IRC.
2011-09-28 09:37:50 +00:00
Sergey Sharybin
f1751d8cd9
Merging r40612 through r40614 from trunk into soc-2011-tomato
2011-09-27 13:22:34 +00:00
Sergey Sharybin
2970db8ef3
Merge trunk up to revision 40611
2011-09-27 13:21:45 +00:00
Jens Verwiebe
6f2d937a63
OSX: introduced a workaround for compiling with non-apple gcc-4.6.1, ghost must be compiled with apple-gcc nevertheless due objc incompatibilities
2011-09-27 13:18:34 +00:00
Campbell Barton
e4c299d975
comment warnings as errors for MSVC - it too easily made small problems like unused vars into errors which gets annoying for non developers.
...
with GCC we have *some* warnings as errors which works out better.
2011-09-27 12:08:35 +00:00
Sergey Sharybin
03f3e7b3fc
Merging r40572 through r40597 from trunk into soc-2011-tomato
2011-09-27 09:26:46 +00:00
Campbell Barton
928e2784c6
py api
...
- use Py_ssize_t when dealing with python sequence sizes
- dont call PySequence_Size(py_b) in a loop (its slow).
- use faster sequence/float parsing in aud.Factory.filter
2011-09-27 05:28:06 +00:00
Sergey Sharybin
8615218d57
Camera tracking integration
...
===========================
- If render size is set to "Full Render" and undistorted render
is enabled, do on-fly undistortion so distortion coefficients
can be visually verifed before baking.
- Made slight change in libmv-side to survive with large distortion
coefficients. Hope this change is fine.
2011-09-26 15:07:06 +00:00
Sergey Sharybin
503ec930f1
Merging trunk up to revision 40571
2011-09-26 15:00:23 +00:00
Sergey Sharybin
3be50219fd
Abort on guarded memory manager errors if WITH_ASSERT_ABORT is set
2011-09-26 14:21:40 +00:00
Daniel Salazar
7ff634b8ef
Reverting change to solver_relax.h from commit 40539, caused this nasty bug http://projects.blender.org/tracker/?func=detail&atid=498&aid=28748&group_id=9
...
I'd say better be careful with code so complex as the fluid sim!
2011-09-26 09:36:51 +00:00
Sergey Sharybin
ae8c7c6b10
Merging trunk into soc-2011-tomato up to revision 40540
2011-09-25 20:03:03 +00:00
Andrew Wiggin
7c46f1c4b7
Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h)
2011-09-25 12:33:51 +00:00
Campbell Barton
274b9c8fb8
whitespace cleanup
2011-09-25 12:31:21 +00:00
Campbell Barton
f260a878e4
give a more useful error when building with an old ffmpeg.
2011-09-25 04:17:00 +00:00
Sergey Sharybin
07e57233e2
Merging r40265 through r40492 from trunk into soc-2011-tomato
2011-09-23 13:20:21 +00:00
Jens Verwiebe
a7891da84b
Fix fluid openMP not baking with some threadcounts
2011-09-23 09:26:03 +00:00
Campbell Barton
4b449aefea
remove support for irix
2011-09-21 08:40:30 +00:00
Campbell Barton
8f5112f191
pep8 update & some minor cmake edits.
2011-09-20 18:29:19 +00:00
Campbell Barton
84d06f252e
tag & comment unused vars with /* UNUSED */
2011-09-20 08:48:48 +00:00
Campbell Barton
83a2f02a78
cleanup endian handling
...
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
2011-09-19 08:02:17 +00:00
Campbell Barton
507aa1cd22
fix for crash loading a file saved with fluidsim when blenders compiled with it disabled.
...
also remove unneed class prefix on function name for itasc.
2011-09-18 11:08:34 +00:00
Sergey Sharybin
bd05d5565a
Merging trunk into soc-2011-tomato up to revision 40241
2011-09-15 18:59:30 +00:00
Campbell Barton
736884fbcb
quiet -Wundef warnings for cmake/gcc/elbeem
2011-09-12 00:55:27 +00:00
Joerg Mueller
ab2fc6f106
Audio:
...
* Fix for high quality upsampling which was wrong.
* Fix for doppler effects which were calculated wrong for scenes.
* Improved animation evaluation at the beginning and end of a scene.
2011-09-11 12:24:11 +00:00
Sergey Sharybin
9b76c09a82
Merging r39717 through r39983 from trunk into soc-2011-tomato
2011-09-07 07:49:46 +00:00
Antony Riakiotakis
aabd702dbd
fix link issues with MinGW - a substitute declaration(correctByteOrder) for itoln that was not present in MinGW was being used. Duplicated the declaration from <winsock2.h>(tried including but gave some errors) and added the appropriate link library, wsock32, according to MinGW documentation.
2011-09-06 11:17:29 +00:00
Campbell Barton
bf5a6531a6
replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3'
2011-09-05 23:46:08 +00:00