50ca81154e
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
6d965f4493
style edits for function declarations
2011-12-30 07:55:15 +00:00
5c6ee6b523
svn merge ^/trunk/blender -r42670:42680
2011-12-17 02:41:53 +00:00
ad96dacbc5
style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)
...
also split some long lines in own code.
2011-12-17 00:52:36 +00:00
f07df7287e
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
...
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
2011-12-04 23:13:28 +00:00
faa022563d
svn merge ^/trunk/blender -r42245:42261
2011-11-29 18:18:56 +00:00
f62ad8f69b
remove header text:
...
"The Blender Foundation also sells licenses for use in proprietary software under the Blender Licens"
also remove NaN references from files that have been added since blender went opensource.
2011-11-29 10:54:47 +00:00
3b5bcab09c
svn merge ^/trunk/blender -r42139:42172
2011-11-26 16:29:14 +00:00
6736576f6d
replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
2011-11-26 04:07:38 +00:00
8651e6fba7
Fix part of #29310 : secondary point caches for cloth did not get steps
...
set to correct default, was 10 when supposed to be 1.
2011-11-24 20:46:00 +00:00
8eb41f0fdb
svn merge ^/trunk/blender -r41998:42009
2011-11-20 16:05:51 +00:00
f1eb66aa68
share code for fluidsim, ocean & dynamic paint file paths.
...
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
2011-11-20 14:38:11 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
21fa7e0b86
Some UI messages fixes and tweaks in recent merges (found while translating in french).
2011-11-14 19:13:52 +00:00
49ccf975f2
minor cleanup
...
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of sync.
2011-11-14 16:05:44 +00:00
11a7a406fb
DPAINT_OT_output_toggle operator was using an index option for what was really a toggle between 2 values, changed its index option to an enum.
...
if a value other than 1/0 was given it would use an uninitialized pointer too (compiler warning, review should pick up this stuff).
also renamed some RNA attrs:
output_name --> output_name_a
output_name2 --> output_name_b
do_output1 --> use_output_a
do_output2 --> use_output_b
do_smudge --> use_smudge
max_velocity --> velocity_max
2011-11-14 06:46:07 +00:00
eadb192986
svn merge -r41723:41751 ^/trunk/blender
2011-11-11 06:37:29 +00:00
92d35b74e7
svn merge -r41722:41723 ^/trunk/blender
2011-11-11 06:25:45 +00:00
dfc30d1229
quiet some warnings from recent merge
2011-11-10 12:28:26 +00:00
edec46b0a6
Merge with trunk r41625
2011-11-07 16:36:49 +00:00
7508540c53
svn merge -r41575:41602 ^/trunk/blender
2011-11-07 07:01:24 +00:00
b82dee0cb4
replace macros with bli math functions for particles code
2011-11-06 14:00:55 +00:00
e936c78251
svn merge ^/trunk/blender -r41503:41575
2011-11-06 10:38:44 +00:00
33accdb725
use (const char*) rather than (char*) where possible.
...
also removed some unused function definitons.
2011-11-05 11:04:28 +00:00
c529631c1e
uncommented particle mirror, tested and it works fine.
2011-11-01 09:21:23 +00:00
cd338a4130
Merge with trunk r41411
2011-10-31 13:18:14 +00:00
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
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
ff837cbe9b
svn merge -r41310:41329 ^/trunk/blender
2011-10-28 05:17:09 +00:00
592879bfca
prefix common internal operator function names so its possible to assign them breakpoints.
2011-10-28 03:02:09 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +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
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
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
74017cb020
header cleanup and typo's
2011-10-22 01:53:35 +00:00
88473fd49a
Code cleanup: remove BLI_exist, now there is only BLI_exists. One function just
...
called the other, they did the same thing.
2011-10-21 22:33:41 +00:00
638a93b235
svn merge ^/trunk/blender -r41075:41099
2011-10-18 01:09:00 +00:00
61389bba41
fix spelling mistakes in comments (and in some python error messages), nothing to effect translations.
2011-10-17 06:39:13 +00:00
8bf78d7f56
Dynamic Paint:
...
* Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster.
* Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps.
* Added clamp/map value to wave image sequence output settings.
* RNA description tweaking.
* General code tweaking.
2011-10-13 20:00:22 +00:00
8695bedda2
svn merge ^/trunk/blender -r40644:40720
2011-10-06 16:59:58 +00:00
e8bb972f3c
Merge with trunk r40782
2011-10-04 11:42:44 +00:00
2d151cda1c
Fix crash when starting baking fluid when baking thread is already started.
2011-09-28 08:31:02 +00:00
4a157de23d
svn merge ^/trunk/blender -r40587:40643
2011-09-28 07:34:48 +00:00
ba58bc51fd
fix [ #28725 ] No way to control fluid simulator from Python API?
...
now exec() blocks while doing fluid bake, invoke starts a background job (texture bake also works this way).
2011-09-28 06:26:46 +00:00
effea8c29b
svn merge ^/trunk/blender -r40511:40587
2011-09-27 03:12:31 +00:00
58587a3881
replace strncpy with BLI_strncpy, in some cases strncpy was being misused since it doesnt ensure \0 termination.
...
also dont call CTX_data_scene() twice when checking for function arguments.
2011-09-26 18:51:10 +00:00
