7 years agoAdded tooltips for various F-Curve RNA defines
Joshua Leung [Mon, 24 Feb 2014 13:44:20 +0000 (02:44 +1300)]
Added tooltips for various F-Curve RNA defines

7 years agoFix T38774: Changing extrapolation type via RNA doesn't update FCurve
Joshua Leung [Wed, 5 Mar 2014 06:38:14 +0000 (19:38 +1300)]
Fix T38774: Changing extrapolation type via RNA doesn't update FCurve

- Added update callback to perform on-update validation when changing the
  extrapolation mode on F-Curves
- There was a patch in the tracker for adding an "update()" method to F-Curves
  which does a similar thing when manually called by scripts. Since we've added
  a function for this in RNA anyways, we might as well add this too while we're
  at it. (NOTE: upon closer inspection, the original patch by Tom Edwards had a
  number of issues, so I ended up reimplementing here)

7 years agoFix T38774: Added missing notifier flags for updating F-Curve after changing extrapol...
Joshua Leung [Mon, 24 Feb 2014 01:15:28 +0000 (14:15 +1300)]
Fix T38774: Added missing notifier flags for updating F-Curve after changing extrapolation from RNA

7 years agoCode cleanup - Extra comments + Reshuffling a few methods
Joshua Leung [Mon, 24 Feb 2014 13:27:42 +0000 (02:27 +1300)]
Code cleanup - Extra comments + Reshuffling a few methods

7 years agoComment fixes
Joshua Leung [Fri, 21 Feb 2014 13:37:14 +0000 (02:37 +1300)]
Comment fixes

7 years agoMaintenance: Start of 2.71 release cycle, BCon1, Alpha.
Thomas Dinges [Fri, 7 Mar 2014 12:43:39 +0000 (13:43 +0100)]
Maintenance: Start of 2.71 release cycle, BCon1, Alpha.

7 years agotweaks to buildinfo
Sergey Sharybin [Fri, 7 Mar 2014 12:26:34 +0000 (18:26 +0600)]
tweaks to buildinfo

We wouldn't really have release branches, building will happen
from annotated tags.

Made it so building tag revision equals to a master branch.

7 years agoFix for own commit: particle rng arrays should be declared extern in the
Lukas Tönne [Fri, 7 Mar 2014 12:18:15 +0000 (13:18 +0100)]
Fix for own commit: particle rng arrays should be declared extern in the

7 years agoRemoving ParticleSystem->frand arrays to avoid memory corruption issues
Lukas Tönne [Fri, 7 Mar 2014 09:25:56 +0000 (10:25 +0100)]
Removing ParticleSystem->frand arrays to avoid memory corruption issues
in threaded depgraph updates and effector list construction.

Gathering effectors during depgraph updates will call the
psys_check_enabled function. This in turn contained a DNA alloc call
for the psys->frand RNG arrays, which is really bad because data must be
immutable during these effector constructions.

To avoid such allocs the frand array is now global for all particle
systems. To avoid correlation of pseudo-random numbers the psys->seed
value is complemented with random offset and multiplier for the actual
float array. This is not ideal, but work sufficiently well (given that
random numbers were already really limited and show repetition quite
easily for particle counts > PSYS_FRAND_COUNT).

7 years agoCorrection to previous commit
Campbell Barton [Fri, 7 Mar 2014 10:17:26 +0000 (21:17 +1100)]
Correction to previous commit

7 years agoFix action-editor crash transforming gpencil and masks
Campbell Barton [Fri, 7 Mar 2014 10:02:07 +0000 (21:02 +1100)]
Fix action-editor crash transforming gpencil and masks

There were 3 bugs with both data types
- using freed memory while sorting.
- sorting failed in some situations.
- scaling allowed multiple items to be on the same frame.

Replace this with a simple sort + de-duplicate, taking selection into account.

7 years agoFix T38985: Setting endpoint_u property while creating spline in Python gives strange...
Sergey Sharybin [Fri, 7 Mar 2014 08:05:10 +0000 (14:05 +0600)]
Fix T38985: Setting endpoint_u property while creating spline in Python gives strange behavior

7 years agoFix T39015: NLA Clip Auto Blend In/Out Check Box Not Working
Joshua Leung [Fri, 7 Mar 2014 06:11:53 +0000 (19:11 +1300)]
Fix T39015: NLA Clip Auto Blend In/Out Check Box Not Working

Fix for regression accidentally introduced in 5f18d863a97 (affecting current 2.70 rc-1)
which means that this setting wasn't working anymore at all.

7 years agoFix T38990: Crash in mask shape re-key
Campbell Barton [Fri, 7 Mar 2014 03:37:14 +0000 (14:37 +1100)]
Fix T38990: Crash in mask shape re-key

7 years agoCode cleanup: style
Campbell Barton [Fri, 7 Mar 2014 02:28:39 +0000 (13:28 +1100)]
Code cleanup: style

7 years agoEditmesh: Toggle between all edge-loop boundaries when selecting
Campbell Barton [Thu, 6 Mar 2014 23:10:23 +0000 (10:10 +1100)]
Editmesh: Toggle between all edge-loop boundaries when selecting

Now Alt+RMB,RMB will select all connected boundaries.

There are times when you just want to select an entire boundary loop
ignoring face topology, previously there was no way to do this.

7 years agoMesh: loopselect return cancelled when no selection made
Campbell Barton [Thu, 6 Mar 2014 21:09:33 +0000 (08:09 +1100)]
Mesh: loopselect return cancelled when no selection made

also un-indent main function body.

7 years agoBMesh: simple edge boundary walker
Campbell Barton [Thu, 6 Mar 2014 20:58:22 +0000 (07:58 +1100)]
BMesh: simple edge boundary walker

7 years agoFix T39000: Align Objects Axis button is not redraw.
Bastien Montagne [Thu, 6 Mar 2014 20:56:32 +0000 (21:56 +0100)]
Fix T39000: Align Objects Axis button is not redraw.

We have to apply button *before* checking others in the ROW, else changes are not propagated to them yet.

7 years agoCycles: Use Displacement type in OSL ShadingSystem.
Thomas Dinges [Thu, 6 Mar 2014 20:02:41 +0000 (21:02 +0100)]
Cycles: Use Displacement type in OSL ShadingSystem.

Reviewed by: brecht
Differential Revision:

7 years agoCuda use streams and async to avoid busywaiting
Martijn Berger [Thu, 6 Mar 2014 19:51:13 +0000 (20:51 +0100)]
Cuda use streams and async to avoid busywaiting

This switches api usage for cuda towards using more of the Async calls.

Updating only once every second is sufficiently cheap that I don't think it is worth doing it less often.

Reviewed By: brecht

Differential Revision:

7 years agoExperimental dyntopo feature:
Antony Riakiotakis [Thu, 6 Mar 2014 18:04:57 +0000 (20:04 +0200)]
Experimental dyntopo feature:

Dyntopo detail in object space. This allows to set the detail in
percentage of blender units and sculpt in this detail constantly,
regardless of the distance to the mesh.

This commit just enables the functionality, which is really trivial.
There will be some more commits like detail flood fill and
detail sampling in the future.

7 years agoForgo one rect union function, partial rect is inferred from nodes that
Antony Riakiotakis [Thu, 6 Mar 2014 17:54:44 +0000 (19:54 +0200)]
Forgo one rect union function, partial rect is inferred from nodes that
are tagged for update anyway. The important part of the fix was updating
the previous rectangle in the draw function.

7 years agoFinal fix (I hope!) for partial redraw.
Antony Riakiotakis [Thu, 6 Mar 2014 17:26:41 +0000 (19:26 +0200)]
Final fix (I hope!) for partial redraw.

The problem here is that the redraw rectangle can be calculated many
times before actual redraw (for instance due to repetitive calls to the
paint step function for space strokes). Those redraw rectangles need to
be accumulated and finally flushed when the draw call is done.

Also, it is this accumulated rectangle that must account for the
previously drawn rectangle to avoid artifacts due to drawing.

Now all looks like it works correctly :)

7 years agoFix T37867: scroll bar in text editor shows the wrong mouse cursor.
Brecht Van Lommel [Thu, 6 Mar 2014 17:20:59 +0000 (18:20 +0100)]
Fix T37867: scroll bar in text editor shows the wrong mouse cursor.

Patch by chipgw.

7 years agoFix X11 mouse cursor flickering briefly to the standard cursor when changing it.
Brecht Van Lommel [Thu, 6 Mar 2014 17:08:59 +0000 (18:08 +0100)]
Fix X11 mouse cursor flickering briefly to the standard cursor when changing it.

Not very visible now but it matters for the next commit.

7 years agoBetter handling for previous fix: Make sure previous redraw rect stays
Antony Riakiotakis [Thu, 6 Mar 2014 16:18:37 +0000 (18:18 +0200)]
Better handling for previous fix: Make sure previous redraw rect stays
after the stroke so that it can be unioned with current rect correctly
during the draw update. For some reason dyntopo clipping misbehaved
before that.

7 years agoFix T37510 Knife missed cuts on small faces.
Howard Trickey [Thu, 6 Mar 2014 15:55:12 +0000 (10:55 -0500)]
Fix T37510 Knife missed cuts on small faces.

For very thin faces, knife sometimes missed cutting a few.
Problem was that a test for edges being totally inside a face
was being applied in inappropriate circumstances. An assumed
invariant about the knife hit structure is not true when
actually in the middle of making cuts.
Also make a 'big epsilon' a little smaller, though don't think
that was the problem in this bug.

7 years agoFix error in previous commit. Included dubious fix for smooth brush by mistake
Antony Riakiotakis [Thu, 6 Mar 2014 14:37:53 +0000 (16:37 +0200)]
Fix error in previous commit. Included dubious fix for smooth brush by mistake

7 years agoSolve partial redraw issues in sculpting.
Antony Riakiotakis [Thu, 6 Mar 2014 14:30:16 +0000 (16:30 +0200)]
Solve partial redraw issues in sculpting.

* Do union with previous partial redraw before overwriting with self and
store unmodified new rect to avoid rect getting bigger.
* Make rect one pixel wider instead of smaller so edges do not get left
outside. Overall this looks quite better.

7 years agoHiding plane tracks was never implemented
Sergey Sharybin [Thu, 6 Mar 2014 14:07:14 +0000 (20:07 +0600)]
Hiding plane tracks was never implemented

7 years agoFix T38955: Misleading tooltip for Clean Tool in Weight Tools Toolshelf.
Bastien Montagne [Thu, 6 Mar 2014 13:30:44 +0000 (14:30 +0100)]
Fix T38955: Misleading tooltip for Clean Tool in Weight Tools Toolshelf.

7 years agoFix T38987 Dope sheet is inoperable with "view slected" when nothing is selected.
Bastien Montagne [Thu, 6 Mar 2014 13:17:26 +0000 (14:17 +0100)]
Fix T38987 Dope sheet is inoperable with "view slected" when nothing is selected.

Code was unconditionnaly setting view's xmin and xmax, even when it was aborting afterward.

7 years agoFixes for proxies color space
Sergey Sharybin [Thu, 6 Mar 2014 11:27:16 +0000 (17:27 +0600)]
Fixes for proxies color space

Basically proxy colorspace didn't work well enough.

It is still a bit weird and mainly:

- Proxies for image sequences are built in the image color space.

- Proxies for movies are built in the movie color space.

This could be unified but would need some work in proxy build
to make it not just pipe frames from one FFmpeg context to
another but also apply OCIO on it.

7 years agoOSX: adapt codesigning_rules_<binary>r.plist’s to 2.70
Jens Verwiebe [Thu, 6 Mar 2014 09:16:03 +0000 (10:16 +0100)]
OSX: adapt codesigning_rules_<binary>r.plist’s to 2.70

7 years agoFix T38973: GLSL error, when using Cycles Light Path node.
Thomas Dinges [Thu, 6 Mar 2014 08:06:20 +0000 (09:06 +0100)]
Fix T38973: GLSL error, when using Cycles Light Path node.

7 years agoUpdate submdules hashes v2.70-rc
Sergey Sharybin [Wed, 5 Mar 2014 18:37:30 +0000 (00:37 +0600)]
Update submdules hashes

- Addons and locales now points to v2.70-rc tag
- Also updated hashes for addons_contrib and scons
  to make them up-to-date while i'm on updating this

7 years agoBump version to Blender2.70rc and new splash
Campbell Barton [Wed, 5 Mar 2014 17:37:14 +0000 (04:37 +1100)]
Bump version to Blender2.70rc and new splash

Splash concept art & paint-over: David Revoy. 3D artwork by Mathieu Auvray.

7 years agoMove do-versions functions for 2.70
Campbell Barton [Wed, 5 Mar 2014 17:33:15 +0000 (04:33 +1100)]
Move do-versions functions for 2.70

7 years agoDon't show branch name on the splash if it's a release branch
Sergey Sharybin [Wed, 5 Mar 2014 17:10:37 +0000 (23:10 +0600)]
Don't show branch name on the splash if it's a release branch

7 years agoFix T38969: RenderResult in RenderPart can be NULL if multithreaded
Lukas Tönne [Wed, 5 Mar 2014 16:42:48 +0000 (17:42 +0100)]
Fix T38969: RenderResult in RenderPart can be NULL if multithreaded
renders are cancelled early.

7 years agoAlternative fix for T38753, use existing __file__ in namespace
Tamito Kajiyama [Wed, 5 Mar 2014 16:27:14 +0000 (03:27 +1100)]
Alternative fix for T38753, use existing __file__ in namespace

7 years agoFix T38970: Invert weights remove weights option not working
Campbell Barton [Wed, 5 Mar 2014 16:07:31 +0000 (03:07 +1100)]
Fix T38970: Invert weights remove weights option not working

Patch D382 from Henrik Aarnio

7 years agoPrevious linestyle icon was old patch, commit right one this time
Campbell Barton [Wed, 5 Mar 2014 15:38:29 +0000 (02:38 +1100)]
Previous linestyle icon was old patch, commit right one this time

7 years agoFix for invalid custom data checks in armature and lattice functions.
Lukas Tönne [Wed, 5 Mar 2014 14:11:36 +0000 (15:11 +0100)]
Fix for invalid custom data checks in armature and lattice functions.

Testing for custom data availability with getVertData and index 0 fails
on assert for empty meshes (the index must be in valid range). Better
use getVertDataArray which has no requirement for specific index.

7 years agoFix for un-subdivide creating duplicate faces
Campbell Barton [Wed, 5 Mar 2014 14:00:18 +0000 (01:00 +1100)]
Fix for un-subdivide creating duplicate faces

7 years agoFreestyle: Fix for incorrect comparisons of Nature values with integer and boolean...
Tamito Kajiyama [Wed, 5 Mar 2014 12:54:50 +0000 (21:54 +0900)]
Freestyle: Fix for incorrect comparisons of Nature values with integer and boolean values.

The problem is that comparisons involving the constants Nature.POINT (for vertices) and
Nature.NO_FEATURE (for edges) were evaluated in a wrong way.  It is recalled that the
Nature class is a subclass of Python's built-in int type, and that these two constants are zero
when evaluated as numbers.  The issue was caused by the implementation of the constants
in an incompatible way for comparison with Python int (and boolean) values.  Specifically,
the zero of Python int is represented by an empty array of digits, whereas the zero-valued
Nature constants were represented by an array of size 1.  Python int comparison operators
first check the lengths of the arrays of two operands, and then start comparing the digits
only when the array length is the same.  For this reason, the two Nature constants were
not properly compared with int values (and thus with boolean values).  It is noted that the
zero-valued Nature constants may result from bitwise operations on other Nature constants
(e.g., Nature.SILHOUETTE & Nature.BORDER), so this issue must have affected many
existing style modules.

The problem was reported by Folkert de Vries (flokkievids) through personal communications.
Thanks a lot!

7 years agoCode cleanup: remove long unused gamma correction tables
Campbell Barton [Wed, 5 Mar 2014 11:36:38 +0000 (22:36 +1100)]
Code cleanup: remove long unused gamma correction tables

7 years agoFix for negative gamma correction rounding to int
Campbell Barton [Wed, 5 Mar 2014 11:33:47 +0000 (22:33 +1100)]
Fix for negative gamma correction rounding to int

7 years agoFix for potential memory leak in Bullet API: freeing dynamic arrays
Lukas Tönne [Wed, 5 Mar 2014 09:00:46 +0000 (10:00 +0100)]
Fix for potential memory leak in Bullet API: freeing dynamic arrays
should use the delete[] operator instead of the plain pointer delete.

7 years agoAdded back code which was commented out for debug reasons
Sergey Sharybin [Wed, 5 Mar 2014 08:52:00 +0000 (14:52 +0600)]
Added back code which was commented out for debug reasons

Also added a patchset for Carve's memory leak fix.

7 years agoFix T38962: Boolean modifier crashes when only right operand has UV layer
Sergey Sharybin [Wed, 5 Mar 2014 08:29:02 +0000 (14:29 +0600)]
Fix T38962: Boolean modifier crashes when only right operand has UV layer

7 years agoEnable requests for buildbot and release builder
Sergey Sharybin [Wed, 5 Mar 2014 08:00:58 +0000 (14:00 +0600)]
Enable requests for buildbot and release builder

7 years agoOSX/scons: according to last commit, , use the version variable
Jens Verwiebe [Tue, 4 Mar 2014 20:08:23 +0000 (21:08 +0100)]
OSX/scons: according to last commit, , use the version variable

7 years agoEdit to last commit, use the version veriable
Campbell Barton [Tue, 4 Mar 2014 19:45:29 +0000 (06:45 +1100)]
Edit to last commit, use the version veriable

7 years agoBuild system: option to copy 'requests' from scons.
Campbell Barton [Tue, 4 Mar 2014 19:36:50 +0000 (06:36 +1100)]
Build system: option to copy 'requests' from scons.

7 years agoOSX/cmake: copy release/site-packages for OSX ( static py for now )
Jens Verwiebe [Tue, 4 Mar 2014 19:31:07 +0000 (20:31 +0100)]
OSX/cmake: copy release/site-packages for OSX ( static py for now )

7 years agoBuild system: add cmake option to install requests
Campbell Barton [Tue, 4 Mar 2014 18:39:53 +0000 (05:39 +1100)]
Build system: add cmake option to install requests

7 years agoFollow up to the offset scale fix for texture painting: texture mask had
Antony Riakiotakis [Tue, 4 Mar 2014 18:35:39 +0000 (20:35 +0200)]
Follow up to the offset scale fix for texture painting: texture mask had
the same issue.

7 years agoOSX/scons: copy release/site-packages for OSX ( static py for now )
Jens Verwiebe [Tue, 4 Mar 2014 17:41:19 +0000 (18:41 +0100)]
OSX/scons: copy release/site-packages for OSX ( static py for now )

7 years agoBuild system: use lstrip with scons
Campbell Barton [Tue, 4 Mar 2014 17:19:55 +0000 (04:19 +1100)]
Build system: use lstrip with scons

7 years agoBuild system copy release/site-packages for windows
Campbell Barton [Tue, 4 Mar 2014 17:12:21 +0000 (04:12 +1100)]
Build system copy release/site-packages for windows

7 years agoFix simplify brush not supporting autosmooth. There is no reason why
Antony Riakiotakis [Tue, 4 Mar 2014 16:57:30 +0000 (18:57 +0200)]
Fix simplify brush not supporting autosmooth. There is no reason why
this should be so and it's useful to quickly decimate and smooth at the
same time.

7 years agoFix volume scatter render issue introduced by recent bugfix.
Brecht Van Lommel [Tue, 4 Mar 2014 16:17:33 +0000 (17:17 +0100)]
Fix volume scatter render issue introduced by recent bugfix.

7 years agoFix T38945, empty "System Bookmarks" and "Recent" panel were drawn in the File Browse...
Thomas Dinges [Tue, 4 Mar 2014 15:47:07 +0000 (16:47 +0100)]
Fix T38945, empty "System Bookmarks" and "Recent" panel were drawn in the File Browser, although these were disabled in User Preferences.

7 years agoFix compilation error windows
Sergey Sharybin [Tue, 4 Mar 2014 14:36:05 +0000 (20:36 +0600)]
Fix compilation error windows

7 years agoFix T38936 Bevel strange flickering on big meshes.
Howard Trickey [Tue, 4 Mar 2014 14:29:31 +0000 (09:29 -0500)]
Fix T38936 Bevel strange flickering on big meshes.

Last change to bevel had a check for what was supposed
to be an "on edge" new vertex being off the edge.
The test tolerance was too small. This fixes that.

7 years agoFix T38918: Boolean modifier crashes when using specific topology
Sergey Sharybin [Tue, 4 Mar 2014 14:01:58 +0000 (20:01 +0600)]
Fix T38918: Boolean modifier crashes when using specific topology

There were loads of issues in the code still which are mow likely fixed:

- Hole resolver hook had memory leak -- it didn't free face with holes
  when triangulating it.

- Original edge mapping didn't work correct. old code related on the fact
  that loop order is not changing when constructing the MeshSet class, but
  in fact it does change.

  Currently used edge map for this because it was easiest way to do it now,
  but after the release we're to change it. Main reason is that face mapping
  is not correct as well (and it was never correct actually). So we'll need
  to construct Mesh structures by our own to be sure we're using correct
  original index mapping.

- Carve might produce faces with ears, which is forbidden in Blender.
  it wasn't an issue in old integration because triangulation will remove
  the ears. So for now simply added ears removing back as a hook.

  But actual reason of the ears is to be investigated really.

  This hook will only work for NGons, quads are assumed not be able to
  have ears. So this additional hook shouldn't slow down things much.

- Carve's hole resolver produces duplicated faces in some cases. Still not
  sure what is the reason of this. Code here is not so much straightforward,
  this is to be investigated later.

  For now solved the issue as own hole resolver which checks for duplicated
  faces after the hole resolving.

  The additional checks here will only run if the mesh actually have hole
  and wouldn't introduce slowdown for faces which doesn't have holes.

- Made it so if edge user triangulation gets a split (for example, in cases
  when this edge intersects with the second operand) it wouldn't be dissolved.

  This prevents cases of crappy topology after dissolving in several cases.

- Edge dissolver didn't check for whether edge is a non-manifold. We couldn't
  really dissolve open manifold edges.

  The bad thing about this is that mesh triangulation might produce non-manifold
  edges and they wouldn't be dissolved. Not worst case in the world, but would
  be nice to have it solved somehow.

- Exporting mesh form Carve to Blender might have produced duplicated edges
  in cases when several non-manifold faces shared the edge. This is also fixed

- Mesh triangulation might have produced duplicated faces, which is really bad.
  Fixed by keeping a track on which faces we've created and skipping adding new
  triangle if we already have one.

This all might introduce some slowdown, but we're too close to the release now,
so would rather have it slower but robust. After the release we might look into
ways to speed things up.

7 years agoFix T38944, Fonts too small in Movie Clip Editor on Retina display.
Thomas Dinges [Tue, 4 Mar 2014 13:26:31 +0000 (14:26 +0100)]
Fix T38944, Fonts too small in Movie Clip Editor on Retina display.

Thanks to Sergey for suggesting this fix.

7 years agoBuild system support for numpy on ms-windows
Campbell Barton [Tue, 4 Mar 2014 13:20:11 +0000 (00:20 +1100)]
Build system support for numpy on ms-windows

7 years agoFix F62828. UV stitch code did not handle non manifold edges very well.
Antony Riakiotakis [Tue, 4 Mar 2014 12:36:46 +0000 (14:36 +0200)]
Fix F62828. UV stitch code did not handle non manifold edges very well.
This made loops in linked lists of uvedges from duplicate members
causing a hang. Now check all previous links before adding a new one. It
is not much slower in practice because non-manifolds are not that

7 years agoFix for regression noted in T38942: Blender Internal rendering can lead
Lukas Tönne [Tue, 4 Mar 2014 10:22:56 +0000 (11:22 +0100)]
Fix for regression noted in T38942: Blender Internal rendering can lead
to wrong obmats of nested dupli objects.

Restoring obmats after BI nested dupli object rendering has to happen
in reverse order, so higher level omats are applied last.

7 years agoFix T38941: Laplacian Deform crashes on OSX
Bastien Montagne [Tue, 4 Mar 2014 08:09:38 +0000 (09:09 +0100)]
Fix T38941: Laplacian Deform crashes on OSX

When vgroup was invalid somehow (e.g. empty, as in this case) and bind could not happen, code was dereferencing a NULL pointer...

7 years agoScons: remove lcms reference
Campbell Barton [Tue, 4 Mar 2014 01:42:17 +0000 (12:42 +1100)]
Scons: remove lcms reference

7 years agoIcon for LineStyle
Campbell Barton [Mon, 3 Mar 2014 16:47:58 +0000 (03:47 +1100)]
Icon for LineStyle

patch T37008 from Michael P.

7 years agoFix T36496: unwanted behavior with NLA strip blend mode Replace.
Brecht Van Lommel [Mon, 3 Mar 2014 15:34:10 +0000 (16:34 +0100)]
Fix T36496: unwanted behavior with NLA strip blend mode Replace.

If you have two overlapping NLA strips it automatically blends between them.
However it was also blending between the first strip and the rest pose
(e.g. 0,0,0 for locations and 1,1,1 for scale).

This is ok if the blend mode is Add or Multiply since then you are adding onto
the rest pose, but for Replace you want to be able to mix between two poses
and not take the rest pose into account at all.

What this does is that to not do any blending for the first strip if it has
blend mode Replace. If someone wants the old behavior (from bugfix commit
27d792fa9ca1) they can still make an action with the rest pose and use that
as the first strip.

7 years agoFix for bmesh triangulate creating duplicate edges
Campbell Barton [Mon, 3 Mar 2014 15:07:23 +0000 (02:07 +1100)]
Fix for bmesh triangulate creating duplicate edges

7 years agoDebug function to check valid bmesh now detects duplicate edges
Campbell Barton [Mon, 3 Mar 2014 14:48:16 +0000 (01:48 +1100)]
Debug function to check valid bmesh now detects duplicate edges

7 years agoUI: "Option" panel in 'Particle Edit' mode was appearing in Tools and GP tab, now...
Thomas Dinges [Mon, 3 Mar 2014 09:37:27 +0000 (10:37 +0100)]
UI: "Option" panel in 'Particle Edit' mode was appearing in Tools and GP tab, now only show in Tools.

Patch by Kévin Dietrich.

Reviewed by: dingto
Differential Revision:

7 years agoUI: Splash text for 'a' releases and the upcoming 'Release Candidate'
Campbell Barton [Mon, 3 Mar 2014 06:29:03 +0000 (17:29 +1100)]
UI: Splash text for 'a' releases and the upcoming 'Release Candidate'

This avoids re-uploading splashes for minor version changes.

Enabling now so any glitches can be found before we do the real rc.

7 years agoFixes for view3d rotate axis snapping
Campbell Barton [Mon, 3 Mar 2014 03:58:07 +0000 (14:58 +1100)]
Fixes for view3d rotate axis snapping

- turntable would lockup when snapping, not allowing further rotation.
- userpref rotate-about-selection was ignored (causing strange panning)

7 years agoFix issue with texture painting: Tex slot scale was being applied twice.
Antony Riakiotakis [Sun, 2 Mar 2014 17:40:39 +0000 (19:40 +0200)]
Fix issue with texture painting: Tex slot scale was being applied twice.

7 years agoFix for own mistake: arc diff swallowed a commit somehow, breaking
Lukas Tönne [Sun, 2 Mar 2014 16:04:24 +0000 (17:04 +0100)]
Fix for own mistake: arc diff swallowed a commit somehow, breaking

7 years agoSwitch Dyntopo enable back to Ctrl-D.
Antony Riakiotakis [Sun, 2 Mar 2014 15:21:41 +0000 (17:21 +0200)]
Switch Dyntopo enable back to Ctrl-D.

Grease pencil straight line can still be enabled by first pressing D
then Ctrl and looks like there is no final consensus on key shortcut.
Better leave this as before and solve after release.

7 years agoFix T37334: Better "internal links" function for muting and node disconnect.
Lukas Tönne [Sun, 2 Mar 2014 15:04:25 +0000 (16:04 +0100)]
Fix T37334: Better "internal links" function for muting and node disconnect.

Implements a more flexible internal connect function for standard nodes
(compositor, shader, texture). Allow feasible datatype connections by

The priorities for common datatypes in compositor, shader and texture
nodes are encoded in a simple function. Certain impossible connections
(e.g. color -> cycles shader) are excluded by giving them -1 priority.

Priority overrides link status: If a higher priority input can be found,
this will be used regardless of link status. Link status only comes into
play for inputs with same priority.

Reviewers: brecht

CC: sebastian_k
Differential Revision:

7 years agoFix for problem with fly speed, caused by other speed tweaks.
Campbell Barton [Sun, 2 Mar 2014 14:08:55 +0000 (01:08 +1100)]
Fix for problem with fly speed, caused by other speed tweaks.

7 years agoFound another place where nproc can be used
Lawrence D'Oliveiro [Sun, 2 Mar 2014 09:28:42 +0000 (10:28 +0100)]
Found another place where nproc can be used

/proc/cpuinfo is a Linux-specific thing. Using GNU [[ | nproc ]] should be more portable.

Reviewers: mont29

Reviewed By: mont29

Differential Revision:

7 years agoCycles: remove ccl_align macro for GPU as unused and unsupported in OpenCL
Sv. Lockal [Sun, 2 Mar 2014 08:44:52 +0000 (12:44 +0400)]
Cycles: remove ccl_align macro for GPU as unused and unsupported in OpenCL

7 years agoFix for collapse ignoring pinned panels
Campbell Barton [Sun, 2 Mar 2014 01:15:09 +0000 (12:15 +1100)]
Fix for collapse ignoring pinned panels

7 years agoFix T38873: Crashing on undo of ocean modifier.
Bastien Montagne [Sat, 1 Mar 2014 19:46:58 +0000 (20:46 +0100)]
Fix T38873: Crashing on undo of ocean modifier.

Issue of this bug is that most part of fftw is not thread safe, only compute-intensive fftw_execute & co are.

Since smoke was affected by this issue as well, a global fftw mutex was added to BLI_threads.
Audaspace also uses fftw in one of its readers (AUD_BandPassReader.cpp),
but this is not an issue currently since this code is disabled in CMake/scons files.

There was another threading issue with smoke, we need to copy dm used by emit_from_derivedmesh(),
as it is modified by this func.

Reviewers: sergey, brecht

Reviewed By: brecht

CC: brecht
Differential Revision:

7 years agoFix T38900: cycles OSL crash running getmessage("trace", "geom:name", name)
Brecht Van Lommel [Sat, 1 Mar 2014 13:57:25 +0000 (14:57 +0100)]
Fix T38900: cycles OSL crash running getmessage("trace", "geom:name", name)

7 years agoNDOF: add navigation modes to user preferences
Campbell Barton [Sat, 1 Mar 2014 10:47:46 +0000 (21:47 +1100)]
NDOF: add navigation modes to user preferences

also comment debug prints for raytracing

7 years agoFix for using non camera objects as a camera having zero area view-frame
Campbell Barton [Sat, 1 Mar 2014 10:41:07 +0000 (21:41 +1100)]
Fix for using non camera objects as a camera having zero area view-frame

7 years agoFix for some unlikely memory leaks, remove redundant checks
Campbell Barton [Sat, 1 Mar 2014 09:14:20 +0000 (20:14 +1100)]
Fix for some unlikely memory leaks, remove redundant checks

7 years agoResolve T38899: changes to Ctrl+Selectmouse conflict with LMB select
Campbell Barton [Sat, 1 Mar 2014 08:26:55 +0000 (19:26 +1100)]
Resolve T38899: changes to Ctrl+Selectmouse conflict with LMB select

7 years agoFix for memory leak in particle brush
Campbell Barton [Sat, 1 Mar 2014 05:25:37 +0000 (16:25 +1100)]
Fix for memory leak in particle brush

7 years agoFix Snap to Symmetry failing to select the vertex from the right side
Campbell Barton [Sat, 1 Mar 2014 04:40:20 +0000 (15:40 +1100)]
Fix Snap to Symmetry failing to select the vertex from the right side

7 years agoFix for own error with updating view2d for NDOF
Campbell Barton [Sat, 1 Mar 2014 04:28:51 +0000 (15:28 +1100)]
Fix for own error with updating view2d for NDOF

7 years agoCode cleanup: correct abs use and quiet warnings
Campbell Barton [Sat, 1 Mar 2014 03:20:54 +0000 (14:20 +1100)]
Code cleanup: correct abs use and quiet warnings

7 years agoFix for baked FCurve subframe interpolation (bad abs use)
Campbell Barton [Sat, 1 Mar 2014 03:12:11 +0000 (14:12 +1100)]
Fix for baked FCurve subframe interpolation (bad abs use)