griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,398 Commits 1 Branch 0 Tags
24dae0f0e83fe9743c6cfaf2d394cd72a893f722
Commit Graph

40398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Campbell Barton
24dae0f0e8 max value for distance was larger then a short. 2012-07-29 20:00:16 +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
Campbell Barton
e32c60284a style cleanup 2012-07-29 00:20:28 +00:00
Sergey Sharybin
e6d80e5848 Merging r49300 through r49333 from trunk into soc-2011-tomato 2012-07-28 18:42:54 +00:00
Sergey Sharybin
7ecc0ba999 Fix regression in clip reloading -- after recent change movie used 
to be reset to default image size instead of it's actual size.
 2012-07-28 18:14:44 +00:00
Sergey Sharybin
a7e943c850 Blender now compiles with recent clang 2012-07-28 17:35:09 +00:00
Campbell Barton
3ec212fd71 patch [#32195] MASKS: Canonical Porter Duff algorithm for merge missing. 
from Troy Sobotka (sobotka)

This gives nicer blending then 'ADD', setting as default for new masks.
 2012-07-28 11:36:01 +00:00
Mitchell Stokes
f405d8fa53 BGE: Fixing a performance regression with 2D filters. My changes caused a check to fail every frame resulting in constant recreation of textures. 2012-07-28 09:45:39 +00:00
Campbell Barton
94576f20f4 fix own error in recent commit - possible uninitialized value. 2012-07-28 00:08:26 +00:00
Campbell Barton
2cd0b3f064 defines to make it easier to manage ik stretch constants (these may need to be tweaked to fix [#32174]) 2012-07-27 23:16:33 +00:00
Campbell Barton
f23bfdfab4 style cleanup 2012-07-27 22:35:27 +00:00
Campbell Barton
e2360ab495 IK's were converting double -> float -> double's in a few places, since precision is important and doubles are used a lot here anyway. just use doubles, also quiet some double promotion warnings. 2012-07-27 22:27:06 +00:00
Mitchell Stokes
f02254f026 Getting rid of some GLEW warnings when compiling ge_videotex in SCons. 2012-07-27 21:54:07 +00:00
Howard Trickey
b1a1f7e0e7 Fixed some knife cut failures. 
Fixes #31391.  Some cases still fail but these
changes are good because they fix a bogus
calculation of the 'basef' of some cut segments.
 2012-07-27 20:12:29 +00:00
Daniel Genrich
24a00f14af Fix compile errors on VC++ 2012 RC1. 
Note: Compile still fails during ceres compile (namespace tr1 problems).
 2012-07-27 18:18:13 +00:00
Sergey Sharybin
718569dc16 Fix #32199: Smooth Vertex no longer has X, Y and Z options. 2012-07-27 17:35:02 +00:00
Sergey Sharybin
990466e87e Initial support for numpy in scons 
Assumes numpy is installed to the BF_PYTHON/site-packages/numpy directory,
could be tweaked further, but this should be enough to setup release
building environment.

Seems blender can't import numpy, but that doesn't seem to be scons issue,
the same happens here with cmake too. Would ask Campbell to help looking
into this.
 2012-07-27 16:01:33 +00:00
Campbell Barton
f1acd6ac3e code cleanup: pass mouse position as int[2] rather then wmEvent 2012-07-27 15:15:55 +00:00
Sergey Sharybin
87a1d2935a Merging r49287 through r49299 from trunk into soc-2011-tomato 2012-07-27 15:12:58 +00:00
Sergey Sharybin
49e0c832e1 Move sRGB conversion initialization to init_exit routines 
It was a threading issue in color management project which potentially
could happen in trunk as well.
 2012-07-27 14:53:57 +00:00
Campbell Barton
409a6ee57b use B key to toggle 'boundary' option for modal inset. 2012-07-27 14:17:05 +00:00
Campbell Barton
7b4733f422 fix usercount error with dropping images in the node view. 2012-07-27 13:57:03 +00:00
Sergey Sharybin
f230a94d49 Fix crash in drawing socket names when zooming out a lot 
--
svn merge -r49291:49292 ^/branches/soc-2011-tomato
 2012-07-27 13:49:55 +00:00
Sergey Sharybin
abeeebd089 Display solver keyframes in cache line 
--
svn merge -r49293:49294 ^/branches/soc-2011-tomato
 2012-07-27 13:49:26 +00:00
Sergey Sharybin
0471ffe9a4 Display solver keyframes in cache line 2012-07-27 13:48:23 +00:00
Campbell Barton
d623454d2e add missing image/mask restore call when undo'ing 2012-07-27 13:24:08 +00:00
Sergey Sharybin
19bf60c54a Fix crash in drawing socket names when zooming out a lot 2012-07-27 13:16:04 +00:00
Sergey Sharybin
5e90606b17 Tomato Cycles: fix for wrong resolution used for rendering Render Layer node 
Issue was caused by Cycles using render options from rendering scene, not
from active scene.

For now solved by passing render resolution inside RenderEngine structure.
This probably could be solved in more general way, like adding bindings

for RenderEngine->Render, which would avoid passing options like
is_animation, came_override and so via RenderEngine. Would think about
this a bit more and probably would do that.

The same issue happens in trunk as well, but not consider such a change
trunk-ready, would want to make more tests and probably clean the code
a little bit before commiting this into trunk.
 2012-07-27 12:16:23 +00:00
Campbell Barton
bef3be5326 code cleanup: mask keys now dont use space-clip keys - could give troubles later on. 2012-07-27 11:56:36 +00:00
Sergey Sharybin
a63ffa9ae3 Merging r49281 through r49286 from trunk into soc-2011-tomato 2012-07-27 11:07:55 +00:00