Commit Graph

10681 Commits

Author SHA1 Message Date
451136e7c0 warning fixes 2011-09-03 15:36:36 +00:00
58227c1016 svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-03 12:57:33 +00:00
a6a14d0a1e == CustomData ==
* Added comments for each entry in the LAYERTYPEINFO array noting the
  number and name of the layer type; was hard to tell before which
  entry was what
2011-09-03 08:18:43 +00:00
8e232af37c svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-03 02:49:21 +00:00
ee22fe7bac Bmesh: fix array copies (fixes snapping), from patch #28429 by Andrew Wiggin (ender79 2011-09-02 10:43:16 +00:00
dc7f56455c fix for error in recent commit, when audaspace is enabled 2011-09-02 04:34:58 +00:00
1f7b41775b minor warning fixes, also correct some float -> double promotions in shadeoutput.c 2011-09-02 03:32:57 +00:00
473292dcd7 fix for building without audaspace, since pepper merge 2011-09-01 09:46:07 +00:00
1db6d629a0 BKE_mesh_calc_edges() now uses polygons when available. 2011-09-01 08:27:35 +00:00
00143a3d55 spaces -> tabs (configure you're editors right!) 2011-09-01 01:48:50 +00:00
fb3f7d9566 svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-01 00:56:21 +00:00
9bc92b2146 svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c 2011-09-01 00:35:30 +00:00
471c005137 typo fix: end of lines ;; --> ; 2011-08-31 01:07:55 +00:00
947d4a654b Fix for [#25062] Sound Actuator - Positional Audio.
Now all sounds that are not mono but have 3D checked automatically get reduced to mono during BGE conversion time.
Also removed the now unneeded function sound_get_channels and added a missing header file to audaspace's CMakeLists.txt.
2011-08-30 10:09:10 +00:00
b3704f45c4 Fixes for snprintf usage:
* replace by BLI_snprintf in various places, note _snprintf on windows
  does not properly null terminate the string.
* fix overflow in sequencer proxy code due to buffer being smaller than
  specified size.
* fix some usage of snprintf as strcpy, this is will go wrong if the
  string contains % characters.
* remove BLI_dynstr_printf function in gpu module, use BLI_dynstr_appendf
2011-08-30 10:07:50 +00:00
43ab8e8624 * Merge trunk up to r39790.
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
2011-08-30 08:22:03 +00:00
5b5e600db6 Last bunch of minor fixes before merge.
* Use NULL in AUD_Reference.h
* Use SETLOOPER in sound.c
* Move flags to the end of Speaker struct.
2011-08-30 07:57:55 +00:00
edde9f2666 Added an 'angle' parameter to the Perlin Noise 1D and 2D geometry modifiers
to specify a displacement direction in degrees.
2011-08-30 00:29:12 +00:00
c5a3f361a0 svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-30 00:23:11 +00:00
88a538048b Fix #28347: VBO's highlights wrong faces when Mirror modifier is in use
Added callback to drawMappedFaces which checks if two faces have got equal draw options.

After discussion with Brecht we found it's nicest solution for now:
- Disabling VBOs in edit mode for this case wouldn't be nicer for this case -
  some additional flag stored in DM should be added in this case.
- Adding new callback in DM isn't nicer that this solution.
- Handling face selection in drawobject would lead to duplicated code
  which is also not nice.

Hopefully, this callback could handle all cases in the future.

Also, Brecht mentioned current VBO implementation isn't perfect, so maybe
when we'll redesign this area dealing with edit mode wouldn't be so tricky.
2011-08-29 16:07:44 +00:00
5bac37f6d4 * Reverting Titlecard commit r37537
* Reverting update recent files commit r37155
* Turning reference counts into unsigned ints
* Minor things
2011-08-29 15:01:55 +00:00
5065d4c744 svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-29 00:46:56 +00:00
1c153b011d Merged changes in the trunk up to revision 39759. 2011-08-28 23:25:13 +00:00
ff7bde2a2f brought back some unused variables removed from previous commit, commented out, in case need their values later 2011-08-28 21:20:10 +00:00
39b66f9ad4 Merge with trunk r39750 2011-08-28 16:46:40 +00:00
0bb7ddad97 Dynamic Paint:
* Added option to preview surface wetmap instead of paint.
* Changed default paint color to blue for better visibility.
* Fix: Random sized particles didn't work anymore.
* Fix: Particle initial velocity issues when using canvas substeps and a particle brush.
2011-08-28 16:36:47 +00:00
c07bd1439a == Sequencer ==
This patch adds:

* support for proxy building again (missing feature from Blender 2.49)
  additionally to the way, Blender 2.49 worked, you can select several
  strips at once and make Blender build proxies in the background (using
  the job system)
  Also a new thing: movie proxies are now build into AVI files, and
  the proxy system is moved into ImBuf-library, so that other parts
  of blender can also benefit from it.
  
* Timecode support: to fix seeking issues with files, that have
  a) varying frame rates
  b) very large GOP lengths
  c) are broken inbetween
  d) use different time code tracks
  
  the proxy builder can now also build timecode indices, which are
  used (optionally) for seeking.
  
  For the first time, it is possible, to do frame exact seeking on
  all file types.
  
* Support for different video-streams in one video file (can be
  selected in sequencer, other parts of blender can also use it,
  but UI has to be added accordingly)

* IMPORTANT: this patch *requires* ffmpeg 0.7 or newer, since
  older versions don't support the pkt_pts field, that is essential
  for building timecode indices.
  
  Windows and Mac libs are already updated, Linux-users have to build
  their own ffmpeg verions until distros keep up.
2011-08-28 14:46:03 +00:00
b4b046995b * Removing mocap GSoC (is an addon already).
* Fixing ffmpeg-0.8 errors.
* Fixing Ketsji paths.
* Removing DoSound from BGE.
* Fixing audio scene update to use only current scene objects.
2011-08-28 14:21:44 +00:00
8e12b7b054 Assorted comment clarification in response to code review notes 2011-08-28 11:39:18 +00:00
fa2ba5fbf5 - use static vars and functions where possible.
- use NULL rather than 0 when used as pointers.
2011-08-28 05:06:30 +00:00
cd0e92c5b7 fix for building with msvc, ssize_t is more correct but in this case its not going to give issues. 2011-08-27 07:06:44 +00:00
c96f28a718 - use %u rather tham %d for unsigned ints in string formatting funcs.
- replace (strlen(str) == 0) with str[0]=='\0'
2011-08-27 03:25:02 +00:00
6926060185 - fix for BL_Shader::SetUniform() missing out the last part of the matrix.
- particle.c wasn't setting all components of the vector when reading cache and setting dummy velocity values.
- some functions incorrectly took a float[3] argument when the 4th value was set.
- remove a few redundant lines of code.
2011-08-27 03:20:32 +00:00
70c955c484 remove deprecated & unused sequencer transform vars 2011-08-27 02:59:43 +00:00
95c5611570 subtraction on unsigned values didnt work as intended for copying ID's. 2011-08-27 02:45:35 +00:00
fe98769877 Cleaned up unused variables 2011-08-25 16:47:47 +00:00
fd0c9afdd1 some floats were being promoted to doubles in subsurf code 2011-08-24 02:44:26 +00:00
fd4575b2e3 svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 02:29:45 +00:00
98f87b77f4 svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 01:44:54 +00:00
33bb1ed53e Merged changes in the trunk up to revision 39661. 2011-08-24 00:18:26 +00:00
6fd68b8d76 fix [#28336] Particles: setting to zero the count of all elements of a group crashes Blender 2011-08-23 12:09:20 +00:00
ba4fd78fac fix [#28344] for this file, the multires smiley has 2 materials, but only 1 loads 2011-08-23 11:46:16 +00:00
ff8daca1f1 Bugfix: Removing a sound from a speaker resulted in a crash. 2011-08-23 11:44:24 +00:00
f0d5abfcb2 Merging trunk up to r39637. 2011-08-22 20:31:46 +00:00
ee40894c05 Bugfix [#28217] Moving multiple selected action strips causes strips
to scale towards zero

This is an attempted bugfix for a bug which seems to be very fickle to
reproduce (it only happens sporadically after quickly jerking the
strips around in a certain way). So far when testing, I haven't had
any more problems after applying this fix, though it may just be
unreliable testing.
2011-08-22 11:51:23 +00:00
06ae5e4825 Reshuffling DopeSheet filter icons so that they appear more obviously
related to each other
2011-08-22 02:14:39 +00:00
c5106fd097 Merge with trunk r39589 2011-08-21 19:37:19 +00:00
5b71334484 Dynamic Paint:
* Bake calculation memory is now freed if surface is deactivated or baked.
* Fixed possibly incorrect brush influence when using "Non-Closed" brush setting.
* Added new rna property descriptions.
* Added some comments and general code cleanup.
2011-08-21 19:03:47 +00:00
c58fb76f1a Merged 39338-39558 2011-08-19 17:15:30 +00:00
3a81f23e09 warning cleanup for -Wdouble-promotion 2011-08-19 16:21:29 +00:00