Sergey Sharybin [Tue, 17 May 2016 10:30:46 +0000 (12:30 +0200)]
Cycles: Reduce amount of malloc() calls from the kernel
This commit makes it so malloc() is only happening once per volume and
once per transparent shadow query (per thread), improving scalability of
the code to multiple CPU cores.
Hard to measure this with a low-bottom i7 here currently, but from quick
tests seems volume sampling gave about 3-5% speedup.
The idea is to store allocated memory in kernel globals, which are per
thread on CPU already.
Reviewers: dingto, juicyfruit, lukasstockner97, maiself, brecht
Reviewed By: brecht
Subscribers: Blendify, nutel
Differential Revision: https://developer.blender.org/D1996
Sergey Sharybin [Wed, 18 May 2016 07:12:47 +0000 (09:12 +0200)]
Cycles: Explicitly mark arguments as unused
Joshua Leung [Wed, 18 May 2016 05:23:16 +0000 (17:23 +1200)]
Fix T48395: Grease Pencil, pressing Ekey to sculpt don't work for left click configurations
When using Left Click select, it wasn't possible to sculpt using E+LMB.
I've changed the order of things in the keymap so that the select operator won't
end up catching and blocking all these events.
Joshua Leung [Tue, 17 May 2016 16:09:07 +0000 (04:09 +1200)]
Fix: "Whole Character" Keying Set should not include Location on bones with "connected" joint
Campbell Barton [Wed, 18 May 2016 01:58:08 +0000 (11:58 +1000)]
Cleanup: cmake, indentation, line length
Brecht Van Lommel [Tue, 17 May 2016 23:50:35 +0000 (01:50 +0200)]
Fix issue in with multiple importance sampling in recent code refactor.
Brecht Van Lommel [Tue, 17 May 2016 20:08:34 +0000 (22:08 +0200)]
Cleanup code style inconsistency in last commits.
Brecht Van Lommel [Tue, 17 May 2016 21:16:54 +0000 (23:16 +0200)]
Fix GCC/Linux build error after finite/isfinite changes.
Brecht Van Lommel [Sun, 15 May 2016 22:48:02 +0000 (00:48 +0200)]
C99/C++11: replace deprecated finite() by isfinite().
Brecht Van Lommel [Mon, 16 May 2016 18:03:59 +0000 (20:03 +0200)]
Fix C++11 build issues on OS X, remove references to outdated libs.
Brecht Van Lommel [Sat, 14 May 2016 12:50:03 +0000 (14:50 +0200)]
Code refactor: use shader pointers rather than shader indexes.
Brecht Van Lommel [Sat, 7 May 2016 23:54:35 +0000 (01:54 +0200)]
Code refactor: use dynamic shader node array lengths now that OSL supports them.
Brecht Van Lommel [Sat, 7 May 2016 17:47:08 +0000 (19:47 +0200)]
Code refactor: add some array utility methods, fix leak in assignment operator.
Thomas Beck [Tue, 17 May 2016 16:08:04 +0000 (18:08 +0200)]
Bendy Bones: Small ui tweak
Change the order of the bending controls ("Curve XY Offsets") so the user can activate both InX and OutX by holding down the left mouse button. This way, it's easy to bend symmetrically on X or Y.
Sergey Sharybin [Tue, 17 May 2016 15:52:23 +0000 (17:52 +0200)]
Fix T48434: Missing meta support in new depsgraph
Joshua Leung [Tue, 17 May 2016 15:19:06 +0000 (03:19 +1200)]
Bendy Bones: Advanced B-Bones for Easier + Simple Rigging
This commit/patch/branch brings a bunch of powerful new options for B-Bones and
for working with B-Bones, making it easier for animators to create their own
rigs, using fewer bones (which also means hopefully lighter + faster rigs ;)
This functionality was first demoed by Daniel at BConf15
Some highlights from this patch include:
* You can now directly control the shape of B-Bones using a series of properties
instead of being restricted to trying to indirectly control them through the
neighbouring bones. See the "Bendy Bones" panel...
* B-Bones can be shaped in EditMode to define a "curved rest pose" for the bone.
This is useful for things like eyebrows and mouths/eyelids
* You can now make B-Bones use custom bones as their reference bone handles,
instead of only using the parent/child bones. To do so, enable the
"Use Custom Reference Handles" toggle. If none are specified, then the BBone will
only use the Bendy Bone properties.
* Constraints Head/Tail option can now slide along the B-Bone shape, instead of
just linearly interpolating between the endpoints of the bone.
For more details, see:
* http://aligorith.blogspot.co.nz/2016/05/bendy-bones-dev-update.html
* http://aligorith.blogspot.co.nz/2016/05/an-in-depth-look-at-how-b-bones-work.html
-- Credits --
Original Idea: Daniel M Lara (pepeland)
Original Patch/Research: Jose Molina
Additional Development + Polish: Joshua Leung (aligorith)
Testing/Feedback: Daniel M Lara (pepeland), Juan Pablo Bouza (jpbouza)
Thomas Dinges [Mon, 16 May 2016 22:37:34 +0000 (00:37 +0200)]
Fix CUDA MEMCPY condition, it should only copy 3D, 2D or 1D.
Found by Brecht, thanks!
Thomas Dinges [Mon, 16 May 2016 22:36:22 +0000 (00:36 +0200)]
Cycles / Requested Features: Volume was missing in logging print.
Bastien Montagne [Mon, 16 May 2016 19:46:55 +0000 (21:46 +0200)]
Usual i18n/UI messgaes fixes...
Campbell Barton [Mon, 16 May 2016 19:26:09 +0000 (05:26 +1000)]
Remove strict header, gives issues with gcc5x
Campbell Barton [Mon, 16 May 2016 17:07:40 +0000 (03:07 +1000)]
Cleanup: use const args
Campbell Barton [Mon, 16 May 2016 17:01:32 +0000 (03:01 +1000)]
CustomData: Support for >2gig layers
Campbell Barton [Mon, 16 May 2016 15:58:07 +0000 (01:58 +1000)]
Cleanup: simplify checks calculating tangents
Bastien Montagne [Mon, 16 May 2016 15:15:18 +0000 (17:15 +0200)]
BLI_task: Add new 'BLI_task_parallel_range_finalize()'.
Together with the extended loop callback and userdata_chunk, this allows to perform
cumulative tasks (like aggregation) in a lockfree way using local userdata_chunk to store temp data,
and once all workers have finished, to merge those userdata_chunks in the finalize callback
(from calling thread, so no need to lock here either).
Note that this changes how userdata_chunk is handled (now fully from 'main' thread,
which means a given worker thread will always get the same userdata_chunk, without
being re-initialized anymore to init value at start of each iter chunk).
Bastien Montagne [Mon, 16 May 2016 14:46:54 +0000 (16:46 +0200)]
BLI_task: Add back lost 'push_from_thread' change to BLI_task_parallel_range() & co.
Campbell Barton [Mon, 16 May 2016 14:15:21 +0000 (00:15 +1000)]
Fix T48447: Inactive menu items don't grey-out icons
Bastien Montagne [Mon, 16 May 2016 13:57:19 +0000 (15:57 +0200)]
BLI_task: make foreach loop index hleper lockfree, take II.
New code is actually much, much better than first version, using 'fetch_and_add' atomic op
here allows us to get rid of the loop etc.
The broken CAS issue remains on windows, to be investigated...
Bastien Montagne [Mon, 16 May 2016 13:56:39 +0000 (15:56 +0200)]
Atomic ops: add 'fetch_and_add_uint32' op.
Needed for next commit.
Bastien Montagne [Mon, 16 May 2016 13:54:18 +0000 (15:54 +0200)]
Cleanup rna_Brush_direction_itemf()
Some variants of gcc compilation were reporting 'control reaching end of non-void function' error
in this switch/case maze. Either use break everywhere or not at all (which is simpler, since we
only always return anyway...).
Sergey Sharybin [Mon, 16 May 2016 08:55:50 +0000 (10:55 +0200)]
Cycles: Cleanup after recent refactor
Wrong indentation, wrong spacing.
Campbell Barton [Sun, 15 May 2016 23:28:46 +0000 (09:28 +1000)]
Revert "Docs: smoke typo corrections"
This reverts commit
b13bc48932761dd813597507b1a1dc86d951ebff.
Wasn't only typo fixes, broke compiling
Campbell Barton [Sun, 15 May 2016 21:52:56 +0000 (07:52 +1000)]
Docs: smoke typo corrections
patch by @Blendify
Campbell Barton [Sun, 15 May 2016 21:35:44 +0000 (07:35 +1000)]
Curve Fitting: correct circular tangent length calculation
Method for scaling is still not perfect but quite close.
Bastien Montagne [Sun, 15 May 2016 19:11:36 +0000 (21:11 +0200)]
Fix T48422: Revert "BLI_task: nano-optimizations to BLI_task_parallel_range feature."
There are some serious issues under windows, causing deadlocks somehow (not reproducible under linux so far).
Until further investigation over why this happens, better to revert to previous
spin-locked behavior.
This reverts commits
a83bc4f59707ab and
98123ae9168.
Porteries Tristan [Sun, 15 May 2016 14:56:40 +0000 (14:56 +0000)]
BGE: Fix KX_LightObject python API documentation.
Replace "..attribute::" by ".. attribute::".
Bastien Montagne [Sun, 15 May 2016 10:35:01 +0000 (12:35 +0200)]
Fix T48425: Armature Symmetrize is flipping Custom Shape parameter.
In case not all bones are selected, not all possible mirrors are set in editbone->temp.ebone,
so we need to search them...
Bastien Montagne [Sat, 14 May 2016 16:02:34 +0000 (18:02 +0200)]
Fix an error in new lockfree parallel_range_next_iter_get() helper.
Reading the shared state->iter value after storing it in the 'reference' var could in theory
lead to a race condition setting state->iter value above state->stop, which would be 'deadly'.
This **may** be the cause of T48422, though I was not able to reproduce that issue so far.
Campbell Barton [Sat, 14 May 2016 12:55:55 +0000 (22:55 +1000)]
Fix Cube generated UV's rotated incorrectly
Bastien Montagne [Sat, 14 May 2016 08:00:52 +0000 (10:00 +0200)]
Fix T48426: Use same length for all header message strings.
Some languages like Chinese or Japanese take three or four bytes per char...
Also fixed some missing translation markers for UI header messages.
Campbell Barton [Fri, 13 May 2016 18:49:42 +0000 (04:49 +1000)]
Correct BM_iter_mesh_bitmap_from_filter return
Campbell Barton [Fri, 13 May 2016 18:05:18 +0000 (04:05 +1000)]
Correct asserts
Campbell Barton [Fri, 13 May 2016 17:25:06 +0000 (03:25 +1000)]
Fix script_paths(check_all=True) missing script paths
BLENDER_SYSTEM_SCRIPTS wasn't included in bpy.utils.script_paths()
Sergey Sharybin [Fri, 13 May 2016 15:37:39 +0000 (17:37 +0200)]
Fix compilation with strict compiler flags
Some const qualifier was discarding.
Sergey Sharybin [Fri, 13 May 2016 15:33:26 +0000 (17:33 +0200)]
Fix T48421: AO pass broken, only works when AO in cycles is enabled
Campbell Barton [Fri, 13 May 2016 15:28:21 +0000 (01:28 +1000)]
Cleanup: rna naming, indentation
Bastien Montagne [Fri, 13 May 2016 12:07:30 +0000 (14:07 +0200)]
Fix T48416: Impossible to copy a linked object from a file to another one mantaining the linked library.
When writing temp blenbuffer file, libraries of linked datablocks where not tagged correctly, which
means they were not put in the temp Main used to write the buffer, resulting in implicit localization
of linked data.
Bastien Montagne [Fri, 13 May 2016 10:54:09 +0000 (12:54 +0200)]
Fix T48416: Impossible to append from another file without localizing also all indirectly linked data.
Previous to 2.77, this used to be default behavior, was changed in rB591f4549c958b.
However, in most append cases, you do want a full localization of your data, so this new behavior
is kept by default, but there is now an option in append operator to only localize the 'first level'
of data (i.e. datablocks from linked library itself, and not those from other 'sub-libraries').
Campbell Barton [Fri, 13 May 2016 12:03:18 +0000 (22:03 +1000)]
Fix T47652: Texture shading mode fails to update material colors
Bastien Montagne [Fri, 13 May 2016 09:05:12 +0000 (11:05 +0200)]
Armature meshdeform evaluation: parallelize computation of bbones deform matrices.
On big and complex rigs like blendrig or koro, it can give up to ~10% more FPS in best cases.
Hard to tackle all cases in tests though, so please report any unexpected slowdown
in armature animation playback!
Bastien Montagne [Fri, 13 May 2016 09:03:04 +0000 (11:03 +0200)]
BLI_task: add support for listbase parallelized for loops.
Code by @sergey, with small edits and doc by @mont29.
Bastien Montagne [Thu, 12 May 2016 11:15:55 +0000 (13:15 +0200)]
Cleanup: fix inconsitency in dynamicPaint_outputLayerExists()
Dyna WPaint indeed only uses first output layer, but better be consistent in those cases...
Bastien Montagne [Thu, 12 May 2016 10:08:03 +0000 (12:08 +0200)]
Dynapaint: cleanup of BKE code.
Line lengths, monolined 'if' statements, int -> bool, etc.
Also, replaced some internal cooked stuff by BLI helpers (most notably, the
'is inside UV triangle' code in `dynamicPaint_createUVSurface()`), and some
other minor optimizations.
Bastien Montagne [Thu, 12 May 2016 10:07:31 +0000 (12:07 +0200)]
BLI_math: add 'equals_m4m4' (and 'm3' variant) helpers.
Sergey Sharybin [Fri, 13 May 2016 09:21:00 +0000 (11:21 +0200)]
Cycles: Scale debug pass with number of samples
This way it's easier to compare different renders together without
worrying about scale too much.
Sergey Sharybin [Fri, 13 May 2016 09:19:32 +0000 (11:19 +0200)]
Image editor: Show actual value of single-channel buffer in sample info
Previously if image only had single channel only z buffer value was displaying.
This isn't handy for cases when you've got single channel buffer which is not
a z buffer.
Also fixed possible read past the array.
Mai Lavelle [Thu, 12 May 2016 22:17:14 +0000 (18:17 -0400)]
install_deps: Avoid conflicts on Arch-based systems when gcc-multilib is installed
install_deps can fail due to conflict between gcc (referenced by base-devel) and
gcc-multilib if the latter is installed. This avoids the conflict by filtering
the contents of base-devel when needed.
Reviewers: mont29
Differential Revision: https://developer.blender.org/D1944
Thomas Dinges [Thu, 12 May 2016 12:51:42 +0000 (14:51 +0200)]
Cycles: Add support for single channel byte textures.
This way, we also save 3/4th of memory for single channel byte textures (e.g. Bump Maps).
Note: In order for this to work, the texture *must* have 1 channel only.
In Gimp you can e.g. do that via the menu: Image -> Mode -> Grayscale
Thomas Dinges [Thu, 12 May 2016 12:20:12 +0000 (14:20 +0200)]
Fix array bounds compile warning.
Campbell Barton [Thu, 12 May 2016 10:58:20 +0000 (20:58 +1000)]
Fix T48413: editmesh intersect tool crash
Its important to add tri-edge intersections from both sides.
Campbell Barton [Thu, 12 May 2016 10:01:49 +0000 (20:01 +1000)]
Correct debug prints
Lukas Tönne [Thu, 12 May 2016 07:54:08 +0000 (09:54 +0200)]
Fix depsgraph tagging during the relations build pass.
Followup commit to
18e5e2fa1ac26ccbbd0cc8b486a5d92be6888021. Needs the same
treatment in the second pass when ID tags are reset again.
Campbell Barton [Thu, 12 May 2016 06:45:47 +0000 (16:45 +1000)]
BMesh: avoid calling delete operator w/ face dissolve
In nearly all cases this isn't needed.
Bastien Montagne [Thu, 12 May 2016 06:00:55 +0000 (08:00 +0200)]
Fix missing piece in recent rBce65fae8f32c (support for '+' key).
Thanks to Daniel Rivera (Dr2d4) for the headup!
Campbell Barton [Thu, 12 May 2016 06:07:14 +0000 (16:07 +1000)]
Recent bmesh face-join caused regression (T48407)
Thomas Dinges [Thu, 12 May 2016 00:11:19 +0000 (02:11 +0200)]
Cleanup: Fix typo.
Campbell Barton [Wed, 11 May 2016 21:13:11 +0000 (07:13 +1000)]
Armature outline drawing used single width line
Only set line width in pose-mode
Campbell Barton [Wed, 11 May 2016 21:09:08 +0000 (07:09 +1000)]
BMesh: use active face fallback w/ select-path
From user perspective, last selected face is the same as the active face,
use this as a fallback.
Thomas Dinges [Wed, 11 May 2016 20:25:48 +0000 (22:25 +0200)]
Cleanup: Remove outdated comment and add new one about slot IDs.
Thomas Dinges [Mon, 9 May 2016 10:51:42 +0000 (12:51 +0200)]
Cycles: Add support for single channel float textures on CPU.
Until now, single channel textures were packed into a float4, wasting 3 floats per pixel. Memory usage of such textures is now reduced by 3/4.
Voxel Attributes such as density, flame and heat benefit from this, but also Bumpmaps with one channel.
This commit also includes some cleanup and code deduplication for image loading.
Example Smoke render from Cosmos Laundromat: http://www.pasteall.org/pic/show.php?id=102972
Memory here went down from ~600MB to ~300MB.
Reviewers: #cycles, brecht
Differential Revision: https://developer.blender.org/D1981
Campbell Barton [Wed, 11 May 2016 20:00:05 +0000 (06:00 +1000)]
BMesh: ignore non-manifold face connections
Was showing an error message,
now dissolve the faces that and delimit at non-manifold boundaries.
Campbell Barton [Wed, 11 May 2016 19:58:38 +0000 (05:58 +1000)]
BMesh: add BMW_ISLAND_MANIFOLD
An island walker that only walks over manifold edges.
Campbell Barton [Wed, 11 May 2016 19:30:20 +0000 (05:30 +1000)]
BMesh Island Walker: use direct loop access
Campbell Barton [Wed, 11 May 2016 18:42:45 +0000 (04:42 +1000)]
BMesh: remove exception from face-join function
Callers need to check for NULL, if we need to know exact cause it could be a return arg.
Campbell Barton [Wed, 11 May 2016 18:39:01 +0000 (04:39 +1000)]
BMesh: boundary walker, skip non-manifold loops
Instead of setting an exception, treat non-manifold edges as boundaries.
Campbell Barton [Wed, 11 May 2016 18:37:36 +0000 (04:37 +1000)]
BMesh: add check for manifold loop
Campbell Barton [Wed, 11 May 2016 18:36:16 +0000 (04:36 +1000)]
Cleanup: only use r_ prefix for return args
Campbell Barton [Wed, 11 May 2016 18:35:40 +0000 (04:35 +1000)]
Cleanup: unused win32 headers
Campbell Barton [Wed, 11 May 2016 15:43:56 +0000 (01:43 +1000)]
error in last commit
Campbell Barton [Wed, 11 May 2016 15:39:33 +0000 (01:39 +1000)]
Correct check for tree being in BVH cache
Campbell Barton [Wed, 11 May 2016 15:37:01 +0000 (01:37 +1000)]
Remove pointer typedef from BVHCache
Used ** arguments unnecessarily,
also replace BLI_linklist_apply with while loop.
Campbell Barton [Wed, 11 May 2016 14:57:18 +0000 (00:57 +1000)]
Fix crash snapping to mesh with no geometry
Sergey Sharybin [Wed, 11 May 2016 14:50:10 +0000 (16:50 +0200)]
Cycles: Use explicit qualifier for single-argument constructors
Almost in all cases we want such constructors to be explicit, there are
exceptions but only in few places.
Campbell Barton [Wed, 11 May 2016 11:36:42 +0000 (21:36 +1000)]
Fix incorrect FLT_MIN use
Germano Cavalcante [Wed, 11 May 2016 09:59:02 +0000 (19:59 +1000)]
Transform Volume rewrite/refactor
Take advantage of the efficiency provided by the snap_context.
Also fixes errors:
- volume snap fails based on view angle (T48394).
- multiple instances of dupli-objects break volume calculation.
Campbell Barton [Wed, 11 May 2016 10:09:40 +0000 (20:09 +1000)]
BMesh: correct fix for face-join removing attached faces
Lukas Tönne [Wed, 11 May 2016 08:52:41 +0000 (10:52 +0200)]
Fix for inline documentation of FOREACH_NODETREE.
Was missing id macro variable.
Lukas Tönne [Wed, 11 May 2016 08:51:10 +0000 (10:51 +0200)]
Fix for node tree ID tagging in new depsgraph.
Nested node trees are not handled in BKE_main_id_tag_all.
Sergey Sharybin [Wed, 11 May 2016 07:23:11 +0000 (09:23 +0200)]
Depsgraph: Add some missing relations
Those cases requires not only geometry component, but also a transform one
to be ready before evaluation can start.
Campbell Barton [Wed, 11 May 2016 04:33:49 +0000 (14:33 +1000)]
BLI_kdopbvh: Use distance for BLI_bvhtree_ray_cast_all
Pass distance argument so its possible to limit the range we get all hits from.
Other changes:
- Use boundbox test before calling callback, avoids redundant calls.
- Remove meaningless return value.
- Add doc string, explaining purpose of this function.
Campbell Barton [Tue, 10 May 2016 16:43:58 +0000 (02:43 +1000)]
CMake: optional date/time overrides for reproducible builds
Campbell Barton [Tue, 10 May 2016 15:32:26 +0000 (01:32 +1000)]
Fix T48387: Mirror weights keeps groups assigned
Swapping the weights kept zero weight verts assigned.
Campbell Barton [Tue, 10 May 2016 15:14:46 +0000 (01:14 +1000)]
BMesh: only remove loose geometry when joining faces
Joining faces could remove faces that happened to share an edge that would normally be removed.
Bastien Montagne [Tue, 10 May 2016 15:49:27 +0000 (17:49 +0200)]
BLI_task: nano-optimizations to BLI_task_parallel_range feature.
This commit makes use of new taskpool feature (instead of allocating own tasks),
and removes the spinlock used to generate chunks (using atomic ops instead).
In best cases (dynamic scheduled loop with light processing func callback), we
get a few percents of speedup, in most cases there is no sensible enhancement.
Sergey Sharybin [Tue, 10 May 2016 15:30:19 +0000 (17:30 +0200)]
Depsgraph: A bit of experiment with skipping where_is_bone if channels is taged as done
This is what old dependency graph was doing and apparently this avoids some updates,
however it's not really clear why those nodes are considering done. Maybe just because
of the way how relations are working. But needs a closer investigation.
Sergey Sharybin [Tue, 10 May 2016 15:15:16 +0000 (17:15 +0200)]
Avoid per-constraint-target call of strlen
It's enough to do one single comparison to see if the string is empty or not.
Sergey Sharybin [Tue, 10 May 2016 14:45:27 +0000 (16:45 +0200)]
Optimize action constraint by avoid memory allocation
Sergey Sharybin [Tue, 10 May 2016 14:14:24 +0000 (16:14 +0200)]
Attempt to fix blenplayer after recent changes
Sergey Sharybin [Tue, 10 May 2016 13:43:03 +0000 (15:43 +0200)]
Revert "Task scheduler: Avoid mutex lock in number manipulation functions"
Appears mutex was guarateeing number of tasks is not modified at moments
when it's not expected. Removing those mutexes resulted in some hard-to-catch
locks where worker thread were waiting for work by all the tasks were already
done.
This reverts commit
a1d8fe052ccd8945f14be5a50bd5af581b89c643.
Sergey Sharybin [Tue, 10 May 2016 13:36:27 +0000 (15:36 +0200)]
Depsgraph: Use some more threading when tagging and finalizing evaluation
Also don't reset values there which were re-set on the next evaluation anyway.
Sergey Sharybin [Tue, 10 May 2016 12:59:19 +0000 (14:59 +0200)]
Task scheduler: Avoid mutex lock in number manipulation functions
It seems using atomic operations here we can avoid having mute without
breaking anything.
Thanks Bastien for double-checking the changes!