griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,426 Commits 1 Branch 0 Tags
aec620cc28d2f0901a49af2b7a6081cef5765443
Commit Graph

40426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Sharybin
aec620cc28 Resolve compilation error with MSVC 2012-07-31 14:27:14 +00:00
Campbell Barton
a86f44a77a svn merge ^/trunk/blender -r49410:49412 2012-07-31 13:44:51 +00:00
Campbell Barton
8f6197bd08 support for curve orco uv's as UV's in cycles. 
ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.
 2012-07-31 13:43:26 +00:00
Sergey Sharybin
b4fff83a34 Merging r49405 through r49410 from trunk into soc-2011-tomato 2012-07-31 13:17:07 +00:00
Sergey Sharybin
60044b12da Tomato Cycles: use the same order of parts as Blender Internal 2012-07-31 13:15:53 +00:00
Jeroen Bakker
e7e7972cd6 Fixed [#32226] Black cadioptric lenses in CPU BokehBlur node 2012-07-31 12:36:08 +00:00
Campbell Barton
8c2550eed7 prevent uninitialized memory use when writing avi's. 2012-07-31 10:34:42 +00:00
Sergey Sharybin
a080183e42 Merging r49400 through r49404 from trunk into soc-2011-tomato 2012-07-30 17:12:55 +00:00
Sergey Sharybin
9880f7fa50 Minor code cleanup 2012-07-30 17:12:01 +00:00
Sergey Sharybin
75046eadbf Mango request: option to create nodes with hidden preview by default 2012-07-30 17:11:59 +00:00
Campbell Barton
b43699aa12 fix own mistake getting an image for the image open file selector. 2012-07-30 17:02:28 +00:00
Campbell Barton
82fc02fb48 fix for own error in r43796, 'Find Missing Files', could set the path to an empty string. 2012-07-30 16:42:26 +00:00
Sergey Sharybin
ccf2f85b3e Merging r49390 through r49399 from trunk into soc-2011-tomato 2012-07-30 16:40:23 +00:00
Sergey Sharybin
9c35147666 Fixed own regression introduced in recent compositor commit 
MuteNode could be used as a replacement for other nodes when
using fast calculation or when using unknown node from blender.

Should work properly now.
 2012-07-30 16:39:39 +00:00
Sergey Sharybin
2feac552eb Color management: initialize input color space for newly opening images 2012-07-30 16:07:37 +00:00
Sergey Sharybin
3ea4c49ef7 Color management: abort execution when error happens in debug mode 2012-07-30 16:07:30 +00:00
Sergey Sharybin
b8c3f59e92 Tomato Cycles: resolve textures limit when using CPU render 
Remove limit for number of textures when using CPU rendering,
so huge scenes from Mango could be rendered properly.

Re-arranged float and bytes textures for this, so now float
textures goes before byte. This is needed to make alignment
stuff easier for variable number of textures.

Also replace code-generated CPU kernel structure's members
with an array, which makes it easier to access textures
without adding bunch of cases in switch.

Should be no functional changes when rendering with GPU
or OpenCL devices.
 2012-07-30 15:26:06 +00:00
Daniel Genrich
46ac23d04e Fix: "void" function returning value. 2012-07-30 12:33:28 +00:00
Campbell Barton
4c5925503e fix for building docs 2012-07-30 10:44:57 +00:00
Sergey Sharybin
1a062e28af Color management: fix crash in partial display buffer update 
Crash was caused by the difference in how compositor walks tile
rectangles and how they were walked in partial update function:
compositor excludes right / top bound and partial update handled
it which lead to reading / writing to wrong memory.

Switch partial update routines to the same logic as it's used
in tile compositor, which made it kind of unified with render
rectangle update.
 2012-07-30 10:35:34 +00:00
Sergey Sharybin
c60eabda92 Merging r49386 through r49389 from trunk into soc-2011-tomato 2012-07-30 09:47:39 +00:00
Sergey Sharybin
585bc327e2 Fix incorrect connections for muted nodes in tile compositor 
Not tile compositor would use the same routines to detect which
links to add for muted node.
 2012-07-30 09:46:14 +00:00
Sergey Sharybin
0c6c907cf7 Tag unused variables 2012-07-30 08:08:04 +00:00
Sergey Sharybin
45e12de050 Merging r49362 through r49385 from trunk into soc-2011-tomato 2012-07-30 07:53:05 +00:00
Mitchell Stokes
977188e373 Fixing [#32210] "Character physics type colliding with sensor type" reported by Daniel Stokes (kupoman) by applying a patch found in this Bullet bug report: https://code.google.com/p/bullet/issues/detail?id=525 2012-07-30 03:45:15 +00:00
Mitchell Stokes
ae483e0cd2 BGE: When using the "Restrict Animation Updates" option, animations are now truly frame rate independent. Thanks to vrav for reporting the issue in IRC. 2012-07-29 23:53:21 +00:00
Mitchell Stokes
0690f6287c BGE: Fix for [#31993] "BGE Vertex deformer optimized method does not work properly" reported by Mario Mey plus some other cleanup. The bug was caused by not taking the object matrix into account when doing the transforms (when I developed the deformer, my test file had the object at the origin...). 2012-07-29 23:49:17 +00:00
Campbell Barton
24dae0f0e8 max value for distance was larger then a short. 2012-07-29 20:00:16 +00:00
Thomas Dinges
3151a9f145 Fix compile error, IK_STRETCH_STIFF_EPS was undefined. 2012-07-29 19:50:03 +00:00
Campbell Barton
4b4395213e inpaint - gain some speed by not doing X/Y clamping in inner loops. 
add assert() so we can ensure its not happening still.
 2012-07-29 19:36:09 +00:00
Campbell Barton
953423e1ed - fix incorrect array delete use. 
- replace 1.0f / sqrt(2) with M_SQRT1_2 define.
- use mini rather then MIN2.
 2012-07-29 19:11:00 +00:00
Campbell Barton
595156fd73 style cleanup: use this->m_* for private members. 2012-07-29 19:02:23 +00:00
Campbell Barton
b9fb8edddd style cleanup 2012-07-29 18:53:47 +00:00
Campbell Barton
a14fc54702 svn merge ^/trunk/blender -r49333:49361 2012-07-29 18:48:34 +00:00
Campbell Barton
7217927414 add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these). 2012-07-29 18:14:20 +00:00
Campbell Barton
f608b3c444 code cleanup: 
- building without python works again
- rename maxi/mini to i_max/i_min (so thay are available for function names)
- some minor edits to IK stretch setting (no functional changes).
 2012-07-29 17:49:14 +00:00
Campbell Barton
c41e1e434a code cleanup: replace MIN2/MAX2 with minf/maxf 2012-07-29 16:59:51 +00:00
Peter Schlaile
b6288e94eb == compositor == 
This adds an inpaint node to blender.

In case, you don't know, inpainting does this:
http://en.wikipedia.org/wiki/Inpainting

It's use cases in blender are 

* wire removal
* green screen background reconstruction

The node isn't tile based (for fundamental reasons), but very fast,
since it first builds a manhatten distance map and after that performs
color convolution only on the edges.

That's something, one should probably add also to the dilate node (in
step mode) to make it perform a lot better for dilate iterations greater
than 3.

It will bring it's computing time from O(n^3) down to O(n^2).
Take a look here for the details: 
http://ostermiller.org/dilate_and_erode.html )
 2012-07-29 15:48:38 +00:00
Jeroen Bakker
93ff6f6dff Support for depth buffers in compositor and viewer node 
Support for only alpha images in compositor and viewer node
 2012-07-29 15:06:50 +00:00
Campbell Barton
4ef8f3f537 code cleanup: assign mode to a variable in the 3d view header and remove some unused imports 2012-07-29 14:07:57 +00:00
Lukas Toenne
588e4a4327 Additional fix #32074, by Sven-Hendrik Haase (svenstaro). Boost version header must be included in cycles in order to expand the version check macro. 2012-07-29 13:52:38 +00:00
Campbell Barton
2553cdf195 style cleanup 2012-07-29 12:07:06 +00:00
Thomas Dinges
ab38e1d379 User Interface Scripts: 
* Code cleanup, removed unneeded code.
* Style cleanup, don't break lines to early 
(unless marked as pep8-80 or pep8-120 compliant) 
* Keep 1 line after layout declaration empty.
 2012-07-29 10:03:46 +00:00
Bastien Montagne
b2462f8985 Sequel of r49112 (raising average bitrate without min/max ones is a bit useless with vbr codecs ;) ). Used +/- 50% of max average br respectively for max/min br... 2012-07-29 08:58:34 +00:00
Mitchell Stokes
9d900fdd11 Fix for [#32213] "Action actuator doesn't finish playing if frame rate drops" reported by Alex Fraser (z0r). The action actuator was calling StopAction when it's time ran out. Now I'm just letting BL_Action handle stopping. Hopefully this doesn't break something else now.... 2012-07-29 06:28:50 +00:00
Mitchell Stokes
7755873771 Fix for [#27484] "Run-time command line options don't work in Multi-texture mode." reported by Josiah Lane (solarlune). The -g nomipmap = 1 option only changed the mipmapping option for bf_gpu, which BL_Texture wasn't checking. 2012-07-29 05:59:03 +00:00
Campbell Barton
0cfd402a7f scale down histogram button movement by 10, was very sensitive 2012-07-29 01:41:46 +00:00
Thomas Dinges
4fc078001d Documentation: 
* Some UI docs for the Best Practise guide. Still WIP.
 2012-07-29 01:38:31 +00:00
Campbell Barton
3270438678 fix for own regression with handling of script paths, however this didnt work quite right before either. 
Handle these 2 kinds of script paths
* user script path: ~/.blender/scripts OR $BLENDER_USER_SCRIPTS
* pref script path: always bpy.context.user_preferences.filepaths.script_directory

now both are returned by bpy.utils.script_paths()
 2012-07-29 01:02:25 +00:00
Mitchell Stokes
f5d643e950 BGE: Fixing a memory leaked caused by the character controller (CcdPhysicsController::m_characterController was not getting freed). 2012-07-29 00:34:18 +00:00