bd86ba2c88
svn merge -r41335:41371
2011-10-30 01:27:49 +00:00
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
16702c1729
Merged changes in the trunk up to revision 41225.
...
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
46ae692710
Merge with trunk r41342
2011-10-28 17:00:53 +00:00
fae903e263
Dynamic Paint:
...
* More code changes pointed by Brecht in codereview.
* Some user interface improvements.
* Updating brush settings now also updates canvas preview.
2011-10-28 14:46:09 +00:00
0701982933
svn merge -r41329:41335 ^/trunk/blender
2011-10-28 12:57:37 +00:00
0d63bb005f
replace VECCOPY and QUATCOPY with inline funcs.
2011-10-28 12:40:15 +00:00
243ef037c9
BMEditMesh.mirror_cdlayer wasnt being set anywhere, adding any other type of layer would break editmesh mirror editing.
2011-10-28 06:23:12 +00:00
ff837cbe9b
svn merge -r41310:41329 ^/trunk/blender
2011-10-28 05:17:09 +00:00
4b635d1631
use generic path remapping when making all library data local, previously only image paths were getting corrected, now all paths will (scene image seq strips, pointcache etc)
2011-10-28 04:44:59 +00:00
699030ceb6
use const for readonly strings and set some functions to static
2011-10-27 14:41:26 +00:00
626f737186
..and now fix linux build since my windows build fix had a lowercase typo
2011-10-27 12:37:14 +00:00
76d2e76aec
Fix windows build (__func__ macro needs definition from BLI_utildefines.h on MSVC)
2011-10-27 12:28:39 +00:00
dbe1c4277a
Fix "[ #29036 ] Crash on solidify" and a few misc subsurf and derived mesh bugs that were blocking correct functionality of "apply modifier to editcage" when you have a subsurf + solidify modifier on the stack
2011-10-27 12:17:02 +00:00
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
99075b35ed
fix [ #29044 ] applying mirror modifier causes crash; something with vertex groups?
2011-10-27 07:54:32 +00:00
f7d5cea669
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
fa6e6e7fc0
pass image description to image loading functions for more useful error than 'Unknown fileformat'.
2011-10-27 04:24:34 +00:00
cd852ce1a1
- remove bpath iterator and replace all uses with visitor.
...
- added flag to optionally receive all paths as absolute.
2011-10-27 01:25:07 +00:00
5afc38b74c
Support more kinds of paths for path re-writing / traversing, patch from Alex Fraser with additions.
...
this now supports as many types as bpath iterator which its intended to replace.
2011-10-26 22:46:06 +00:00
92fe279fe6
quiet -Wempty-body and unused warnings
2011-10-26 21:30:08 +00:00
a267f9ba4e
edits ontop of Alex's patch from r41292.
...
pass main rather than use G.main when naming from -> to relative paths.
2011-10-26 21:22:35 +00:00
ba0ef7a592
Fix #29030 : render operator only used scene property if layers was used, now it
...
is possible to specify the scene without the layer too.
2011-10-26 14:05:01 +00:00
cfb435e8a5
Fix 28960: if BM_free_data_layer[_n] removed the last layer, we didn't clear data->pool and instead kept it pointing to the pool that gets freed at the end of update_data_blocks
2011-10-26 13:24:58 +00:00
Alex Fraser
f09d36d6bc
Fix [ #28772 ] Filepaths are not remmaped after making a library item local
...
Added a visitor function to simplify processing of file paths that are attached to IDs. This is used for images, and could be used for other ID types in future.
Code reviewed by ideasman_42.
2011-10-26 10:49:21 +00:00
94f8e3198d
svn merge -r41266:41287 ^/trunk/blender
2011-10-26 03:26:52 +00:00
675076a06e
cmake macro to set less strict flags per file - remove_strict_flags_file(file, file...)
...
this way we can avoid removing strict flags for all files in blenkernel.
2011-10-25 11:06:52 +00:00
61b699bf9b
remove $Id from headers
2011-10-24 23:32:24 +00:00
da8a7928c9
svn merge ^/trunk/blender -r41230:41266
2011-10-24 23:06:27 +00:00
47463742e2
Cycles: svn merge -r41232:41266 ^/trunk/blender
2011-10-24 22:51:44 +00:00
4cd1e6337e
Cycles: svn merge -r41225:41232 ^/trunk/blender
2011-10-24 22:32:00 +00:00
55ab66b455
Cycles: svn merge -r41205:41225 ^/trunk/blender
2011-10-24 20:19:04 +00:00
5b6224c847
Remove currently unused IMB_cache_limiter_* function.
...
Would be replaced with movie cache soon.
2011-10-24 17:26:24 +00:00
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
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
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
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
70bf00a74c
svn merge ^/trunk/blender -r41200:41226 .
2011-10-24 08:45:55 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
77a7ec7c61
svn merge ^/trunk/blender -r41150:41175
2011-10-24 05:00:53 +00:00
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
0503a4f7a6
svn merge ^/trunk/blender -r41100:41150
2011-10-24 04:18:28 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
67e744ccf0
fix some typo's
2011-10-23 15:27:36 +00:00
398fd3621c
committing 'a' to merge into the tag
2011-10-23 12:21:41 +00:00
2bfd10131e
Cycles: svn merge -r41182:41205 ^/trunk/blender
2011-10-22 19:06:41 +00:00
d4541fd891
Merge with trunk r41197
2011-10-22 16:43:23 +00:00
30cba27987
Dynamic Paint:
...
* Some changes and cleanup pointed on the codereview.
2011-10-22 16:16:14 +00:00
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
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
