Commit Graph

47594 Commits

Author SHA1 Message Date
Peter Larabell
3795d73235 Adds property to mask splines to allow them to be negated (black masks), still needs work in tracking.c 2012-05-30 21:15:17 +00:00
Monique Dewanchand
722ce85ff6 Fix for
[#31562] New compositor crashes due to incorrect opencl initialization
2012-05-30 21:09:50 +00:00
Campbell Barton
125e7550ff draw options for mask spline matching the UV view 2012-05-30 16:22:33 +00:00
Campbell Barton
001ea9fc9f minor mask draw code refactor 2012-05-30 15:23:17 +00:00
Campbell Barton
d9e8b097bf svn merge ^/trunk/blender -r47214:47229 2012-05-30 14:46:30 +00:00
Lukas Toenne
f462743dae Viewer linking operator has to flag the node tree for update, to ensure the dependency sorting is correct (avoid red links). 2012-05-30 14:42:40 +00:00
Sergey Sharybin
6fb53f7c42 Several small fixes to nodes:
- Code formation fix in keying node
- Fixed crash when creating keying screen for frame where there's no movie
- Attempt to improve keying node to handle alpha on hair better
2012-05-30 14:39:20 +00:00
Sergey Sharybin
39e6acfb08 Merging r47215 through r47226 from trunk into soc-2011-tomato 2012-05-30 14:33:24 +00:00
Sergey Sharybin
4a71d2e86c Fixed crash of mask node when mask is not set 2012-05-30 14:30:28 +00:00
Campbell Barton
b6950f42b6 only keyframe selected maskobjects 2012-05-30 13:46:44 +00:00
Campbell Barton
6340a10cc5 fix for own mistake 2012-05-30 13:21:13 +00:00
Jeroen Bakker
ada8dbe12a * fixed memory leak in compositor operation.
- leaked when render result could not be received.
2012-05-30 13:07:55 +00:00
Campbell Barton
ba7606db15 impliment restrict select option. 2012-05-30 12:54:50 +00:00
Daniel Genrich
be21080cb6 Provide ray hit/nearest information on which side of the quad the ray hit.
Patch by MiikaH.
2012-05-30 12:53:13 +00:00
Campbell Barton
44806d2c2b fix for mask transform in non proportional mode. 2012-05-30 12:08:08 +00:00
Campbell Barton
ad00c1210a rename macros for mask point selection - were a bit confusing. 2012-05-30 11:52:44 +00:00
Campbell Barton
1b10fdec48 svn merge ^/trunk/blender -r47210:47214 2012-05-30 09:28:37 +00:00
Campbell Barton
8ae1f38812 workaround for crash when rig library links dont load. - will leak memory but better then crash. 2012-05-30 09:27:16 +00:00
Campbell Barton
27c6ab9857 fix incorrect delete usage in the compositor. 2012-05-30 09:15:02 +00:00
Campbell Barton
c53c19ce32 proportional editing keys now work when editing masks. 2012-05-30 08:20:20 +00:00
Campbell Barton
877db8f881 svn merge ^/trunk/blender -r47201:47210 2012-05-30 08:04:06 +00:00
Campbell Barton
47584648dc split up proportional editing keymap functions (adding this in tomato branch was messy) 2012-05-30 08:02:49 +00:00
Campbell Barton
22982e9351 minor transform change to stay in sync with mask branch 2012-05-30 07:38:33 +00:00
Campbell Barton
a111662e1a proportional editing for masks 2012-05-30 07:34:25 +00:00
Campbell Barton
c93bfdd78b proportional editing for mask transform 2012-05-30 07:15:09 +00:00
Campbell Barton
6bee4c7a8f transform wasnt ignoring hidden maskobjects 2012-05-30 06:42:03 +00:00
Campbell Barton
d4c7f2d53d clear active object when hiding unselected objects too. 2012-05-30 06:37:40 +00:00
Campbell Barton
eb6a6edc3d circle select for mask view (Ckey) 2012-05-30 06:33:44 +00:00
Campbell Barton
03136f0680 mask object hide/reveal - access from H/Alt+H/Shift+H and eye icon in listview.
added alpha setting though its not used for rendering yet.
2012-05-30 06:07:26 +00:00
Campbell Barton
766307e311 svn merge ^/trunk/blender -r47184:47201 2012-05-30 04:48:10 +00:00
Nathan Letwory
f5011d3aaa Remove useless file 2012-05-30 04:17:21 +00:00
Campbell Barton
8284b8a56d mask - border & lasso select (lasso uses Ctrl+Alt - as with clip view) 2012-05-29 20:48:15 +00:00
Benoit Bolsee
58bc424b3c BGE #30734: add support for physics linear and angular thresholds and deactivation time from python and GUI.
========================
The linear and angular thresholds set the speed limit (in m/s) and rotation limit (in rad/s)
under which a rigid body will go to sleep (stop moving) if it stays below the limits for a 
time equal or longer than the deactivation time (sleeping is disabled is deactivation time is 
set to 0).
These settings help reducing the processing spent on Physics during the game.

Previously they were only accessible from python but not working because of a bug. 
Now the python functions are working and the settings are available in the Physics panel
of the World settings when using the Blender Game render engine.

Python API:
  import PhysicsConstraints
  PhysicsConstraints.setDeactivationLinearTreshold(float)
  PhysicsConstraints.setDeactivationAngularTreshold(float)
2012-05-29 20:30:33 +00:00
Benoit Bolsee
1d4ab9daf0 Win32: Compilation fix for quicktime import 2012-05-29 20:06:31 +00:00
Daniel Genrich
3495479b4f Bugfix [#31629] Cloth simulation results are much different from older ones
This is only a partial bugfix, reducing the repulse to 1/3.

Cloth collision will still behave different because it is now catching more collisions.
2012-05-29 19:12:49 +00:00
Dan Eicher
52aad984b6 Outliner Drag & Drop fixes
OUTLINER_OT_parent_drop
 * use scene of child instead of active scene
 * poll to check if parent and child are in same scene

OUTLINER_OT_parent_clear
 * get scene from child instead of only working on active scene
 * poll to check if no parent

OUTLINER_OT_scene_drop && OBJECT_OT_make_links_scene
 * memory leak on error
 * would only link some objects on error
2012-05-29 18:12:13 +00:00
Sergey Sharybin
e95885322d Fix terrible mistake on merging keying patch which originally was against trunk.
This resulted in compositor crashes when using mask node.
2012-05-29 15:30:56 +00:00
Brecht Van Lommel
3d55cf64cb Fix #31591: info header reports missing with custom key configuration due to
wrong keymap timer writing, some timer types were missing.
2012-05-29 15:04:11 +00:00
Campbell Barton
7d04e4c53e svn merge ^/trunk/blender -r47150:47184 2012-05-29 15:02:21 +00:00
Sergey Sharybin
ec4f675055 Fixed stupid typo: dispill vs. despill 2012-05-29 14:55:01 +00:00
Campbell Barton
b63a2be5c1 fix for using uninitialized memory when adding spline points, also fix for deleting points not working right. 2012-05-29 14:54:40 +00:00
Jeroen Bakker
feb3dc926a Compositor filter node
* edges (x=0, x=width-1, y = 0 y=height-1) were not taken into acount
correctly
used CLAMP function to limit the filter operation to existing pixels
2012-05-29 14:38:28 +00:00
Jeroen Bakker
87d433d16c * Compositor Alpha channel was not effected by the ConvolutionFilters
(Filter:Sharpen, Filter:Soften, etc)
2012-05-29 14:25:28 +00:00
Jeroen Bakker
8a30382a8a * Compositor fix for OpenCL [OpenCL platform installed, but no
available devices]
   - could happen when having laptops with a hard switch between video
cards (intel/NVidia switch)
   - or when an opencl platform was installed on a machine without any
OpenCL compatible GPU
2012-05-29 14:13:08 +00:00
Sergey Sharybin
876665ac25 Initial commit of new keying nodes
First node is called Keying Screen (Add -> Matte -> Keying Screen) and it's
aimed to resolve issues with gradients on green screens by producing image
with gradient which is later used as an input for screen color in keying nodes.

This node gets motion tracks from given movie clip and trackign object and uses
them to define color and position of points of gradient: for position marker's
position on current frame is sued, for color average color of pattern area is
used.

Gradient is calculating in the following way:
- On first step voronoi diagram is creating for given tracks.
- On second step triangulation of this diagram happens by connecting sites
  to edges which defines area this site belongs to.
- On third step gradient filling of this triangles happens. One of triangle
  vertices is colored with average track color, two rest vertoces are colored
  with average color between two neighbor sites. Current pixel's color in
  triangle is calculating as linear combination of vertices colors and
  barycentric coordinates of this pixel.

This node is implemented for both tile and legacy compositor systems.

Second node is basically a combination of several existing nodes to make keying
more straighforward and reduce spagetti mess in the compositor, but it also
ships some fresh approaches calculating matte which seems to be working better
for not actually green screens.

This node supports:
- Chroma preblur
- Dispilling
- Clip white/black
- Dilate/Erode
- Matte post blur

This node doesn't support chroma pre-blur for legacy compositor (yet).

There're still lots of stuff to be improved here, but this nodes night already
be used i think.

Some details might be found on this wiki page:
http://wiki.blender.org/index.php/User:Nazg-gul/Keying

This patch also contains some currently unused code from color math module, but
it was used for tests and might be used for tests in the future. Think it's ok
to have it in branch at least.
2012-05-29 14:00:47 +00:00
Dan Eicher
45dbb715ee Revert makesrna part of r47158 because it broke building blenderplayer
Apparently not supposed to call ED_* functions from there

Also added a missing "\n" that's been annoying me for a long while
2012-05-29 13:59:31 +00:00
Campbell Barton
f5917b15b5 support for marker parent offset 2012-05-29 13:23:34 +00:00
Campbell Barton
777d0255ff fix for parenting, offset isnt needed anymore 2012-05-29 13:18:11 +00:00
Campbell Barton
08fa15b64a fix crash with using uninitialized curves 2012-05-29 11:48:34 +00:00
Brecht Van Lommel
ef0c8d532a Fix #31631: keyframe insert on uv layer element not working. 2012-05-29 11:19:46 +00:00