griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,616 Commits 1 Branch 0 Tags
da170d9dc3dd84f1b77f737a94d5863b0d67dd21
Commit Graph

47594 Commits

Author SHA1 Message Date
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
Sergey Sharybin
5b6224c847 Remove currently unused IMB_cache_limiter_* function. 
Would be replaced with movie cache soon.
 2011-10-24 17:26:24 +00:00
Sergey Sharybin
3cbadbf895 MovieCache implementation 
Implementation of cache for general movie-related areas
such as sequencer and clip editor (in the future)

Some changes in limiter were necessary:
- Limiter counted mapped memory twice when was checking 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.

Seqcache is switched to use this new cache code.
 2011-10-24 17:12:28 +00:00
Sergey Sharybin
8afc509be4 Some small fixes and changes: 
- Add *.cc files to qtcreator project as well as .cpp and .cxx
  (would be needed for correct generating projects with libmv library).
- Added negate_v2 and negate_v2_v2 functions. They'll be needed for
  camera tracking project.
- Fixed issue with generating proxies from 32bit images.
  (generated jpg-s opened fine in blender, but were dark in osx viewer).
- Marked unused arg in indexer as UNUSED.
 2011-10-24 17:09:31 +00:00
Campbell Barton
15e6d6cd75 svn merge ^/trunk/blender -r41226:41227 . 2011-10-24 12:43:08 +00:00
Campbell Barton
a29c3b2bbb fix [#28961] FCurves.range() returns wrong values for one-point curves (sic!) 
also fix for case where verts were treated as found but were infact not because none were selected.
 2011-10-24 12:26:14 +00:00
Sergey Sharybin
5a6605610d Fix #28949: can't render video to Flash 
Several issues were discovered when was looking into this bug:

- MPEG file format didn't set needed codec settings such as frame
  rate and so, Was caused by not very correct fix fix #21351.
- "Expert" codec settings stored in idprops was affected on
  formats which don't actually need them causing some conflicts
  in codec settings.
- Flash codec doesn't support b-frames.

Now C presets shouldn't affect on each other and flash coded wouldn't
use b-frames even when using h264 format. Should work fine for files
created from scratch. If existing files fails to render, try to
switch file format to something else and then back to needed value.
 2011-10-24 10:26:37 +00:00
Campbell Barton
a1af5ae6a6 fix for error utf8 printing input. 2011-10-24 10:11:47 +00:00
Campbell Barton
70bf00a74c svn merge ^/trunk/blender -r41200:41226 . 2011-10-24 08:45:55 +00:00
Campbell Barton
dbe2fe5043 fix for errors with merge 2011-10-24 08:18:20 +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
5571485bad fix for crash when entering in non unicode ascii chars. 
now allow these but only for filepaths.
 2011-10-24 06:57:53 +00:00
Campbell Barton
77a7ec7c61 svn merge ^/trunk/blender -r41150:41175 2011-10-24 05:00:53 +00:00
Campbell Barton
809131bc80 added function BKE_library_filepath_set which sync's the libraries absolute path when setting to a relative value, before this you could never be sure if a libraries absolute path was valid or not because the user might have changed the relative library path in the outliner, now setting from the outliner and py/rna syncs the absolute path. 2011-10-24 04:52:43 +00:00
Campbell Barton
0503a4f7a6 svn merge ^/trunk/blender -r41100:41150 2011-10-24 04:18:28 +00:00
Andrew Wiggin
618d4d1a6e Add some validation checking and fix a bug in bmesh_[cut|splice][edge|vert] (used by vertex ripping) 2011-10-23 22:21:55 +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
Thomas Dinges
f1cea89d99 Typo fixes for the typo fixes. :D 2011-10-23 15:43:12 +00:00
Campbell Barton
67e744ccf0 fix some typo's 2011-10-23 15:27:36 +00:00
Campbell Barton
e89107927b - fix for error with utf8 textinput for buttons 
- ensure input is valid utf8 from ghost and NULL then complain if its not.
- added function to get utf8 size BLI_str_utf8_size()
 2011-10-23 13:52:51 +00:00
Brecht Van Lommel
66ef02aaa3 Code refactoring: split main 3d view drawing function into object drawing and 
info overlay drawing functions.
 2011-10-23 13:00:41 +00:00
Brecht Van Lommel
d1e04d376d RNA: fix collection iterator issue in c++ api with msvc. 2011-10-23 12:58:19 +00:00
Campbell Barton
398fd3621c committing 'a' to merge into the tag 2011-10-23 12:21:41 +00:00
Campbell Barton
f5b37d40ca set pythons 'sys.stdout' encoding to utf-8 and use surrogateescape error handler. 
without this printing a unicode string may raise an error which is a real pain especially since script authors often forget this and print the path of a file for example on export which can make a script fail outright when writing to paths with certain encodings.
 2011-10-23 07:51:21 +00:00
Campbell Barton
fcb88306b4 rna access to event.unicode so scripts can get unicode text input. 2011-10-23 07:03:57 +00:00
Campbell Barton
a0529a8ae8 py/rna api crash fix: getting event.ascii would crash blender (strange nobody noticed this, seems its been there for over a year???). 2011-10-23 06:56:39 +00:00
Campbell Barton
0664868aec BLI_make_file_string wasn't guaranteed to initialize the resulting path, some parts of the code accounted for this but most not, always initialize the string to "". 2011-10-23 05:56:55 +00:00
Campbell Barton
e58eb5db6f use defines for keying set names to avoid confusing them with text and having some incorrect names (as fixed in last commit) 2011-10-23 05:08:02 +00:00
Campbell Barton
6c9362a2ea fix for incorrect keying set names 'Scale' vs 'Scaling', where 'Scale' was hard coded in auto keyframe when 'Only Insert Needed' option was enabled and would always fail to return a keying set. 
- to be included in 2.60a.
 2011-10-23 04:48:13 +00:00
Campbell Barton
8e2bc6cdbc Context menu 'Edit Source' operator no longer needs to be enabled as a build option, improved this so the python file:line lookups are only done when the operator runs (previously this was done for every button, every draw when the build option was enabled). 
Perhaps this should be hidden when not running with --debug, easy to change.
 2011-10-23 04:13:56 +00:00
Campbell Barton
29417887d7 fix for own mistake r41192 2011-10-23 01:06:38 +00:00
Brecht Van Lommel
2bfd10131e Cycles: svn merge -r41182:41205 ^/trunk/blender 2011-10-22 19:06:41 +00:00
Brecht Van Lommel
83a44e48e7 Cycles: some code changes to sync with trunk. 2011-10-22 18:54:57 +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
Miika Hamalainen
e441c71f77 Dynamic Paint: 
* Fixed a memory leak from previous commit.
 2011-10-22 17:15:32 +00:00
Brecht Van Lommel
29f279e43d Render API: add update_progress() function to update progress bar progress from 
external render engines.

Also refactoring to move some render engine registration stuff out of RNA and
into render module.
 2011-10-22 17:01:54 +00:00
Miika Hamalainen
d4541fd891 Merge with trunk r41197 2011-10-22 16:43:23 +00:00
Brecht Van Lommel
1bdf652b89 Code refactoring: move external engine functions into own file. 2011-10-22 16:24:28 +00:00
Miika Hamalainen
30cba27987 Dynamic Paint: 
* Some changes and cleanup pointed on the codereview.
 2011-10-22 16:16:14 +00:00
Thomas Dinges
952560dc02 * Re-commit splash screen with Alpha header. 2011-10-22 16:01:19 +00:00
Brecht Van Lommel
e417e011d5 Code cleanup: file operations merged into single header, some function names 
made less cryptic and changed to indicate if they work on files or directories.
 2011-10-22 15:35:49 +00:00
Campbell Barton
c1de5cc838 - use defines for wmKeyMapItem & wmEvent alt/shift/ctrl/oskey 
- clear utf8_buf on key up & complain if its set (should never happen)
 2011-10-22 11:34:01 +00:00
Campbell Barton
ebe63b664b py api - added PyC_UnicodeFromByteAndSize() to match PyUnicode_FromStringAndSize() 
also made RNA_property_string_get_alloc() return the length of the new string to avoid having to run strlen on it after.
 2011-10-22 10:49:35 +00:00
Alexander Kuznetsov
8f4a015684 Fix for alt-tab in Windows. 
utf8_buf can be not null terminated, plus not init as in this case. (I need to investigate more)
 2011-10-22 04:36:58 +00:00
Campbell Barton
19f79f73a8 BLI_utildefine minor edits 
- removed AVG2, was only used once.
- remove unused LONGCOPY define.
- removed BLI_STRUCT_OFFSET, was only used once, replce with offsetof
- formatting edits, split some macros over multiple lines.
 2011-10-22 03:39:13 +00:00
Campbell Barton
74017cb020 header cleanup and typo's 2011-10-22 01:53:35 +00:00