Bastien Montagne [Wed, 18 Jul 2012 08:51:19 +0000 (08:51 +0000)]
Fix [#32135] FRAMERATE: Framerate display is truncated in selection box.
Filename extension was striped twice...
Campbell Barton [Wed, 18 Jul 2012 08:13:30 +0000 (08:13 +0000)]
adding objects active groups now gives menu of which group to add to.
Mitchell Stokes [Wed, 18 Jul 2012 05:51:44 +0000 (05:51 +0000)]
Fix for [#32129] "2D filter texture width off by one?" reported by Alex Fraser (z0r).
The GetWidth() and GetHeight() functions of the canvas' display area seem to give values that are both off by one for what OpenGL wants. Adding 1 to both values seems to fix the problem.
Campbell Barton [Tue, 17 Jul 2012 20:40:12 +0000 (20:40 +0000)]
mask rasterizer unfilled line end capping now works with aspect and blending.
Campbell Barton [Tue, 17 Jul 2012 20:01:01 +0000 (20:01 +0000)]
wip mask capping - works but needs aspect correction and to be faded out.
Bastien Montagne [Tue, 17 Jul 2012 18:14:59 +0000 (18:14 +0000)]
Spellcheck: minkovsky -> minkowski! (Only in comments/UI messages :/ ).
Bastien Montagne [Tue, 17 Jul 2012 17:55:23 +0000 (17:55 +0000)]
Fix [#32133] Numpad Enter key doesnt work with Loopcut (worked in 2.49b)
Adding PADENTER to the "OK" keys...
Sergey Sharybin [Tue, 17 Jul 2012 16:22:18 +0000 (16:22 +0000)]
Feather self-intersection test speed up
Made some minor optimization such as:
- Avoid using "%" operation in loops, replace with a check
for index "overflow".
- Use pre-computed values for scaling feather coordinates
to 0 .. 1 space.
This allowed to reach couple of milliseconds of boost.
Another change is to use higher number of buckets (up to 512).
This doesn't took significantly more memory (like uses only 10MB
of memory for average splines) and allows to have 30-50x boost
for average splines.
Use dynamically calculated number of buckets for this, to be
sure segments would fit two buckets.
Also fixed intersection detection in some cases when edge is
shared between two buckets -- it is possible that such edge
would cross third bucket and intersect edge from there.
Campbell Barton [Tue, 17 Jul 2012 15:44:33 +0000 (15:44 +0000)]
holding shift with cont. grab now works on the hsv cube and the value slider.
Campbell Barton [Tue, 17 Jul 2012 15:16:44 +0000 (15:16 +0000)]
option to clear all keys from a button, so you dont have to hunt about for the keys inserted.
Campbell Barton [Tue, 17 Jul 2012 13:28:30 +0000 (13:28 +0000)]
fix for particle system using uninitialized stack memory with midpoint of rk4 integrators.
Campbell Barton [Tue, 17 Jul 2012 12:05:15 +0000 (12:05 +0000)]
use math vector init functions
Sergey Sharybin [Tue, 17 Jul 2012 10:43:57 +0000 (10:43 +0000)]
Fixed crash when rasterizing spline with only one point
It was an issue in new feather self-intersection test code.
Campbell Barton [Tue, 17 Jul 2012 10:38:22 +0000 (10:38 +0000)]
fix for scons building with compositor
Campbell Barton [Tue, 17 Jul 2012 10:19:47 +0000 (10:19 +0000)]
fix for building without the compositor
Campbell Barton [Tue, 17 Jul 2012 09:56:10 +0000 (09:56 +0000)]
disable feather collapse during drawing, its very slow.
Campbell Barton [Mon, 16 Jul 2012 23:23:33 +0000 (23:23 +0000)]
code cleanup: spelling
Sergey Sharybin [Mon, 16 Jul 2012 19:23:15 +0000 (19:23 +0000)]
Fixed disappearing in some circumstances feather
Real fix would be to find a point which is definitely now on loop
to be collapsed, but that's for a bit later. This commit should
remove possible stoppers.
Sergey Sharybin [Mon, 16 Jul 2012 18:34:57 +0000 (18:34 +0000)]
Fixed crash caused by recent feather collapse commit
Sergey Sharybin [Mon, 16 Jul 2012 17:54:28 +0000 (17:54 +0000)]
Masks: feather self-intersection collapse function
This implements simple function which collapses internal loops
caused by self-intersections into a singularity.
This loops can't be removed because rasterizer expects points
of feather be aligned with points from spline itself.
Nicholas Bishop [Mon, 16 Jul 2012 16:55:58 +0000 (16:55 +0000)]
Put paint mask grid allocation in a critical section
When OpenMP is enabled, memory allocation needs to be protected.
Fixes bug [#32111] Memory management regression from svn_46520
projects.blender.org/tracker/index.php?func=detail&aid=32111&group_id=9&atid=498
Campbell Barton [Mon, 16 Jul 2012 16:16:05 +0000 (16:16 +0000)]
toggling node hide/sockets/options was triggering a re-render.
Campbell Barton [Mon, 16 Jul 2012 15:40:47 +0000 (15:40 +0000)]
correct own error in logic for skipping mask layers, inverted mask layers with zero alpha still need to be evaluated.
Campbell Barton [Mon, 16 Jul 2012 14:27:45 +0000 (14:27 +0000)]
show alpha in the mask buttons item list
Campbell Barton [Mon, 16 Jul 2012 14:17:01 +0000 (14:17 +0000)]
use calculated spline resoltion rather then fixed at 32.
Campbell Barton [Mon, 16 Jul 2012 13:12:52 +0000 (13:12 +0000)]
defailt to ease weight interpolation
Campbell Barton [Mon, 16 Jul 2012 13:00:54 +0000 (13:00 +0000)]
fix for crash & leak when layer render option is disabled.
Campbell Barton [Mon, 16 Jul 2012 12:49:01 +0000 (12:49 +0000)]
fix for occasional crash with splines a lot larger then the view
Campbell Barton [Mon, 16 Jul 2012 12:08:28 +0000 (12:08 +0000)]
mask rasterizer - use quad interpolation - gets rid of ugly diagonal banding, introduces glitch with bowtie quads, will have to fix next.
Campbell Barton [Mon, 16 Jul 2012 12:01:18 +0000 (12:01 +0000)]
barycentric_weights_v2_quad wasn't working quite right, rewrite as an expanded version of interp_weights_poly_v2() that cuts down duplicate calculations.
Campbell Barton [Mon, 16 Jul 2012 10:36:40 +0000 (10:36 +0000)]
add 2d version of interp_weights_poly_v3
Campbell Barton [Mon, 16 Jul 2012 09:41:38 +0000 (09:41 +0000)]
mask fill/cyclic toggle wasnt refreshing compo nodes
Campbell Barton [Mon, 16 Jul 2012 08:53:11 +0000 (08:53 +0000)]
correct own naming error BLI -> BKE
Campbell Barton [Mon, 16 Jul 2012 08:42:55 +0000 (08:42 +0000)]
fix for linking with scons.
Campbell Barton [Mon, 16 Jul 2012 08:26:42 +0000 (08:26 +0000)]
handy cmake list macros for inserting items into a list before/after existing items
Campbell Barton [Mon, 16 Jul 2012 07:23:16 +0000 (07:23 +0000)]
mask blending modes: lighten/darken/multiply/replace
Campbell Barton [Mon, 16 Jul 2012 07:04:10 +0000 (07:04 +0000)]
fix crash for empty or single vertex layers.
Campbell Barton [Mon, 16 Jul 2012 06:39:40 +0000 (06:39 +0000)]
small speedup for mask rasterizer, only do single sided check for triangle intersection.
Mitchell Stokes [Mon, 16 Jul 2012 03:43:57 +0000 (03:43 +0000)]
BGE: The Action Actuator now returns correct values to work with the Actuator Sensor.
Campbell Barton [Sun, 15 Jul 2012 16:57:21 +0000 (16:57 +0000)]
svn merge -r48944:48942 .
revert moving the file, adding a new module didnt resolve linking issue.
Campbell Barton [Sun, 15 Jul 2012 16:16:34 +0000 (16:16 +0000)]
moving mask rasterizer file, this breaks building, will fix next commit
Campbell Barton [Sun, 15 Jul 2012 15:11:52 +0000 (15:11 +0000)]
replace fminf with minf
Bastien Montagne [Sun, 15 Jul 2012 12:53:16 +0000 (12:53 +0000)]
"Fix" [#32033] In the execution result of with_automatic_weight, the difference is seen right and left.
This auto/heat vgroup creation seems to be fuzzy/unstable (each run gives a slightly different result). I have not the competences (nor time) to investigate that laplacian stuff, so for now just adding an option when parenting to an armature with envelope/heat, to mirror weights along the X axis (as it is done by default when doing it from the Weight Paint mode).
Campbell Barton [Sun, 15 Jul 2012 11:35:13 +0000 (11:35 +0000)]
math function to get the intersection point between 2 lines (not 2 segments which we already have).
Campbell Barton [Sun, 15 Jul 2012 11:33:13 +0000 (11:33 +0000)]
fix: node background image move operator didn't take zoom into account when clamping pan bounds.
Sergey Sharybin [Sun, 15 Jul 2012 10:48:19 +0000 (10:48 +0000)]
Fixed deadlock caused by thread locks added in 48893
This deadlock was caused by lock of threads using LOCK_DRAW_IMAGE
mutex and lock used in render result acquire functions.
So if image draw would lock LOCK_DRAW_IMAGE before compositor
operation released render result it'll lead into a deadlock.
Campbell Barton [Sun, 15 Jul 2012 03:11:07 +0000 (03:11 +0000)]
falloff option for mask layers
Campbell Barton [Sun, 15 Jul 2012 00:29:56 +0000 (00:29 +0000)]
minor refactor for rect functions. more consistent naming.
Campbell Barton [Sun, 15 Jul 2012 00:07:41 +0000 (00:07 +0000)]
fix for some bugs when the mask layer was outside the view, also clamp the layer buckets within the view.
Campbell Barton [Sat, 14 Jul 2012 23:26:54 +0000 (23:26 +0000)]
fix for minor error in previous commit (wasnt connecting right faces for cyclic mask), also avoid doing more area calculations then needed when checking if the mouse is moving away from uiBlock.
Campbell Barton [Sat, 14 Jul 2012 23:23:24 +0000 (23:23 +0000)]
unfilled-cyclic curves now works as expected, also fix for own crash on 32bit systems.
Campbell Barton [Sat, 14 Jul 2012 20:53:52 +0000 (20:53 +0000)]
use a different setting for fill/cyclic - you may want to have unfilled cyclic curves.
Campbell Barton [Sat, 14 Jul 2012 20:29:17 +0000 (20:29 +0000)]
mask rasterizer, render unclosed splines as lines.
Campbell Barton [Sat, 14 Jul 2012 19:21:13 +0000 (19:21 +0000)]
code cleanup
Campbell Barton [Sat, 14 Jul 2012 18:57:16 +0000 (18:57 +0000)]
zealous bounds checking broke the invert option.
Campbell Barton [Sat, 14 Jul 2012 18:42:59 +0000 (18:42 +0000)]
mask rasterization: use a simpler method to check if a bucket intersects with a triangle.
Campbell Barton [Sat, 14 Jul 2012 18:37:48 +0000 (18:37 +0000)]
rename vars for line dist funcs to make more sense
Campbell Barton [Sat, 14 Jul 2012 17:58:42 +0000 (17:58 +0000)]
mask rasterizer - test if buckets overlap the face before adding the face into the bucket.
Sergey Sharybin [Sat, 14 Jul 2012 17:30:49 +0000 (17:30 +0000)]
Fix #31021: Render settings are not taken into account for curves
Refactored code a bit to make naming a bit more clear and added a
function to create mesh from given display list rather than from
object's displist.
Tested using plain curves (which doesn't imply using derived meshes)
and curves with constructive modifiers (which are using derived meshed).
Campbell Barton [Sat, 14 Jul 2012 16:54:10 +0000 (16:54 +0000)]
add dynamic bucket xy resolution based on pixel size, also remove some redundant copying.
Campbell Barton [Sat, 14 Jul 2012 16:03:03 +0000 (16:03 +0000)]
minor refactor, some comments and var names were misleading.
Campbell Barton [Sat, 14 Jul 2012 15:46:32 +0000 (15:46 +0000)]
minor refactor for mask rasterizer
Campbell Barton [Sat, 14 Jul 2012 15:29:45 +0000 (15:29 +0000)]
header comment cleanup, explain whats the difference between confusingly named drarnode.c and node_draw.c.
Campbell Barton [Sat, 14 Jul 2012 15:29:05 +0000 (15:29 +0000)]
replace masking rasterizer with a more simple geometry based rasterizer (for the compositor).
notes:
- uncomment #define USE_RASKTER in BKE_mask.h to use the previous mask rasterizer.
- slightly slower for regular masks but significantly faster for feather.
- main benefit is that it threads well so works nice for tile compositor.
- feather is lower quality, can use some improvements here.
- feather can also use some interpolation enhancements, will do later.
Bastien Montagne [Sat, 14 Jul 2012 14:03:36 +0000 (14:03 +0000)]
Fix [#32086] Missing bevel "hold shift" for better accuracy.
This commit adds "shift" and numtype to both Bevel and Inset mesh operators.
It also gets rid of the magicnumber used in NumInput to str operation (currently, 20 chars per element, now defined as NUM_STR_REP_LEN in ED_numinput.h).
Campbell Barton [Sat, 14 Jul 2012 12:47:49 +0000 (12:47 +0000)]
use gcc attributes for BLI alloc functions
Mitchell Stokes [Sat, 14 Jul 2012 04:43:32 +0000 (04:43 +0000)]
BGE: Better fix for the textures not working with custom shaders regression. Now custom shaders work, and textures aren't uploaded twice for GLSL materials (my earlier fix had some bad logic).
Campbell Barton [Sat, 14 Jul 2012 04:07:59 +0000 (04:07 +0000)]
more minor speedups for new mask rasterizer
Campbell Barton [Sat, 14 Jul 2012 01:43:33 +0000 (01:43 +0000)]
new mask rasterizer - replace kdopbvh with with own bucket lookups.
Campbell Barton [Sat, 14 Jul 2012 00:33:58 +0000 (00:33 +0000)]
add is_quad_convex_v2(), SET_UINT_IN_POINTER, GET_UINT_FROM_POINTER macros & some minor edits.
Bastien Montagne [Fri, 13 Jul 2012 20:50:32 +0000 (20:50 +0000)]
Fix [#32013] Crash loading a 2.49b model
Problems were in the old multires loading system.
Actually, the sigsev itself was the easy part of the job (simply had to convert from tesselated data to polys/loops), but after that I was getting a horrible bunch of wild stray faces...
It finally turned out it was a mismatch in two different subsurf structs used while computing a mdisps layer from the multires DM, leading to getting complete random normals (null ones, NAN ones...), leading to complete dummy tangent space matrix, leading to absurds mdisps values...
Note: I also moved the copy of first layer's vertex and face data from old me->mr to mesh's v/fdata earlier in multire_load_old(), to be able to use general face_to_poly conversion function (later on we would have to do it by hand, the general function would erase our newly computed mdisps layer...).
Took me the whole week (something like 20h) to track this down: multires + subsurf = C nightmare!
Sergey Sharybin [Fri, 13 Jul 2012 13:47:13 +0000 (13:47 +0000)]
Fix #32087: Crash while changing values in comp editor (bt and blender included)
Issue was caused by threading conflict between compositor output node which
is freeing buffers used by render result image and image draw code which
could use buffers at the same time as compositor frees this buffers.
Solved by adding adding lock around viewer image invalidation and image
drawing.
Use renamed LOCK_PREVIEW mutex for this, which si not called LOCK_DRAW_IMAGE.
With new compositor locking for preview is not needed so it could be removed.
Added the same lock around viewer operation which also frees buffers used
by viewer image. It's actually quite difficult to check whether this is
indeed needed. This code seems to be using acquire/release technique, but
somehow acquiring ImBuf before invalidating it in compositor operation
doesn't resolve the issue, so probably it's not actually locking acquire
and things should be checked deeper.
Campbell Barton [Fri, 13 Jul 2012 12:55:30 +0000 (12:55 +0000)]
fix for crash with new rasterizer
Jeroen Bakker [Fri, 13 Jul 2012 12:50:10 +0000 (12:50 +0000)]
Inner loop optimization of blur node
Jeroen Bakker [Fri, 13 Jul 2012 12:24:42 +0000 (12:24 +0000)]
Removed parameter from executePixel and initializeTileData.
Campbell Barton [Fri, 13 Jul 2012 12:03:53 +0000 (12:03 +0000)]
speedup - because we know triangles will always have the same z value.
Campbell Barton [Fri, 13 Jul 2012 11:48:30 +0000 (11:48 +0000)]
temp disable quad interpolation
Campbell Barton [Fri, 13 Jul 2012 09:22:58 +0000 (09:22 +0000)]
masking - add feather faces as quads and interpolate as quads to avoid ugly diagonal lines.
Campbell Barton [Fri, 13 Jul 2012 09:19:05 +0000 (09:19 +0000)]
new function barycentric_weights_v2_quad(), like barycentric_weights_v2 but for quads.
takes vecs and a point and assigns 4 weights, needed for nice quad interpolation for mask feathering.
Dalai Felinto [Fri, 13 Jul 2012 06:07:28 +0000 (06:07 +0000)]
bugfix: [#32073] Displace node different result between Low and high quality
Campbell Barton [Thu, 12 Jul 2012 20:10:41 +0000 (20:10 +0000)]
new mask rasterizer written to take advantage of the compositors threading, mostly functional but disabled by default (still a little wip).
Jeroen Bakker [Thu, 12 Jul 2012 19:48:16 +0000 (19:48 +0000)]
Missed H file
Jeroen Bakker [Thu, 12 Jul 2012 19:19:03 +0000 (19:19 +0000)]
Small optimizations in compositor.
Most of them are not noticeable.
Thomas Dinges [Thu, 12 Jul 2012 16:19:29 +0000 (16:19 +0000)]
3D View / Edges menu:
* Removed a redundant "Edge Crease" entry and some code cleanup.
Sergey Sharybin [Thu, 12 Jul 2012 16:08:22 +0000 (16:08 +0000)]
Fix #31988: VBOs Textured solid : no update of material in 3Dview
Issue was caused by VBOs using CD_TEXTURE_MCOL for faces colors. This
layer was creating on mesh display (from draw_tface_mapped__set_draw)
in cases there's no such a layer.
If material settings are changing, this layer wasn't updated and old
colors were used.
Fixed by performing an update of this layer in cases it's already
exists. This would give some % of slowdown, but don't think it'll
be dramatically bad.
Would be nice to find a nice way to update such a layer in cases
material is actually changes only, or get completely rid of it/
Sergey Sharybin [Thu, 12 Jul 2012 15:36:22 +0000 (15:36 +0000)]
Fix #32067: since BMesh, files < 2.59.3 no longer have their texface converted
Issue was caused by performing conversion from FTFaces to materials from
the end of lib_link_mesh, where tesselated faces were cleared already.
This conversion can't be switched to BMesh structures because in future
MTexPolys could be changed in a way, that versioning stuff wouldn't work
any more. Another issue is that making such a conversion per-mesh would
lead to quite a code spagetti, which is difficult to follow.
Solved by splitting per-mesh cycle in lib_link_mesh, so now it consists
of three steps:
- Do linking stuff such as custom data layers, materials. Perform a
Conversion stuff like tessface -> polys.
- Convert all MTFaces to materials. This conversion handles all meshes
and creates needed materials.
- Free tessfaces, mark mesh as linked.
Such a separation shouldn't noticeably affect on speed of linking.
Lukas Toenne [Thu, 12 Jul 2012 15:14:50 +0000 (15:14 +0000)]
Fix #32051, Ungroup operator crashes. The link iterator can be invalidated when unconnected input links are removed.
Sergey Sharybin [Thu, 12 Jul 2012 14:41:52 +0000 (14:41 +0000)]
Fix #31584: Fractional step in value input for Skin Modifier (Event/input problem)
Issue was caused by the code which checked whether snapping should be enabled
on transform init taking into account keymap and special keys state. It was
used for Ctrl-Click on manipulator only.
Check for Ctrl state gave wring result with skin modifier. It was solved
by additional check for which mode transformation is initializing for --
currently manipulator is available for translation/roation/resize only
which doesn't give any keymap issues.
Sergey Sharybin [Thu, 12 Jul 2012 12:06:40 +0000 (12:06 +0000)]
Clip editor mode selection: show menu with modes on TAB
This seems to be the only straightforward way to switch fast between
modes without keeping bunch of shortcuts and current mode in head.
Sergey Sharybin [Thu, 12 Jul 2012 11:52:09 +0000 (11:52 +0000)]
Fixed issue with drag-n-drop into Clip Editor.
Jens Verwiebe [Thu, 12 Jul 2012 11:35:51 +0000 (11:35 +0000)]
OSX: make the progressbar in dock a gradient, to give it a more matching 3D appearance
Sergey Sharybin [Thu, 12 Jul 2012 11:22:46 +0000 (11:22 +0000)]
Fix for metaballs used as dupli-object for particle
It used to be a dependency cycle which lead to incorrect or
missed tesselation on some circumstances.
Seems to be introduced in rev41627.
This commit seems to behaving properly on simple cases,
probably could fail in some other cases, so need to be
checked further.
Discovered when was looking into:
#32034: Metaball used as render object(group) for particle will display wire only.
Sergey Sharybin [Thu, 12 Jul 2012 10:27:22 +0000 (10:27 +0000)]
Fix #32041: Empty display size is not taken into account for centering view
Sergey Sharybin [Thu, 12 Jul 2012 09:56:18 +0000 (09:56 +0000)]
Fix #32050: UV map and game engine property cause crash
Campbell Barton [Thu, 12 Jul 2012 09:24:17 +0000 (09:24 +0000)]
add bli rect min/max functions.
Campbell Barton [Thu, 12 Jul 2012 09:03:45 +0000 (09:03 +0000)]
feather points now align with mask outline when called with same resolution.
Campbell Barton [Thu, 12 Jul 2012 08:34:59 +0000 (08:34 +0000)]
- add a temp var for edge scanfill (fits in 4 bytes alignment - won't increase mem usage)
- make keyindex an unsigned int, since its used to store vertex indices
- use BLI_in_rcti_v for IN_2D_VERT_SCROLL and IN_2D_HORIZ_SCROLL
Campbell Barton [Thu, 12 Jul 2012 08:31:23 +0000 (08:31 +0000)]
add bli rect funcs BLI_rctf_init_minmax, BLI_rcti_init_minmax
Sergey Sharybin [Thu, 12 Jul 2012 07:30:50 +0000 (07:30 +0000)]
Fix #32082: face textures lost when linking scene from another file
Issue was caused by missing expand for MTexPoly-s tpages.
Sergey Sharybin [Thu, 12 Jul 2012 07:15:32 +0000 (07:15 +0000)]
Fix crash on creating tooltip for sequencer's gl preview mode
Issue was caused by missed value for this enum, fixed by adding check
in tooltip generation.
Default value for this enum should also be fixed, but that would be
in separated commit.