6 years agoCycles-Bake: displacement support (fix T40068)
Dalai Felinto [Wed, 7 May 2014 20:26:24 +0000 (17:26 -0300)]
Cycles-Bake: displacement support (fix T40068)

Code with contribution from Brecht Van Lommel.

Reviewers: brecht

Differential Revision:

6 years agoBake API: calculating differentials
Dalai Felinto [Wed, 7 May 2014 22:23:38 +0000 (19:23 -0300)]
Bake API: calculating differentials

Code with contribution from Brecht Van Lommel (he wrote the
bake_differentials actually ;)

Reviewers: brecht

Differential Revision:

6 years agoClarification of UI messages:
Antony Riakiotakis [Thu, 8 May 2014 16:25:46 +0000 (19:25 +0300)]
Clarification of UI messages:

Show that modifier may not be supported in dyntopo rather than sculpt
mode in general. This is useful information since users may confuse the
two. Multires for instance is surely supported in sculpt mode, but not
in dyntopo.

6 years agoFix T39950, part 2.
Antony Riakiotakis [Thu, 8 May 2014 16:15:36 +0000 (19:15 +0300)]
Fix T39950, part 2.

Warn when a modifier does not support optimal drawing and mask/hidden
parts display.

User report was that hidden parts became visible after adding a new
modifier subdivision. Subdivision was added with the Ctrl+number keys.
First part of the fix was to make sure we add a multires instead of the
subsurf modifier in sculpt mode with the PageUp/Down Ctrl+number keys.

We can't really stop users from having added a subsurf modifier already.
We could be "smart" and convert subsurf to mulrires upon entering sculpt
mode maybe but that can easily backfire - or users may actually want
that. For now, just warn that the modifier won't support Hiding/Masking
and optimal drawing.

6 years agoFix T40074: Autosmooth option causes assert failure when selected.
Bastien Montagne [Thu, 8 May 2014 15:48:00 +0000 (17:48 +0200)]
Fix T40074: Autosmooth option causes assert failure when selected.

No need to call `dm_ensure_display_normals()` when using loop normals,
poly/vert ones have already been computed!

6 years agoFix regression from 2.70:
Antony Riakiotakis [Thu, 8 May 2014 14:58:55 +0000 (17:58 +0300)]
Fix regression from 2.70:

Multires did not support hiding in zero level. It's a case of PBVH not
being used in drawing due to code reporting active modifiers being used.

However multires level zero can be treated as effectively no modifier
and we can use mesh PBVH.

6 years agoFix T40079: cycles crash with objects that have hair motion blur, but no triangle...
Brecht Van Lommel [Thu, 8 May 2014 13:25:16 +0000 (15:25 +0200)]
Fix T40079: cycles crash with objects that have hair motion blur, but no triangle motion.

6 years agoFix typo
Campbell Barton [Thu, 8 May 2014 09:54:04 +0000 (19:54 +1000)]
Fix typo

6 years agoWorkaround T40046: Undo/redo crashes properties editor
Campbell Barton [Thu, 8 May 2014 09:44:53 +0000 (19:44 +1000)]
Workaround T40046: Undo/redo crashes properties editor

Clear the path for now on undo

6 years agoRemoved a Freestyle hack for DAG updates introduced in commit rBae58968e0a61.
Tamito Kajiyama [Thu, 8 May 2014 09:42:03 +0000 (18:42 +0900)]
Removed a Freestyle hack for DAG updates introduced in commit rBae58968e0a61.

Now that Freestyle employs a separate Main, this workaround is no longer necessary.

Reviewers: sergey

Reviewed By: sergey

Differential Revision:

6 years agoBugfix T40082: NLA Meta strips were no longer evaluating correctly
Joshua Leung [Thu, 8 May 2014 09:00:59 +0000 (21:00 +1200)]
Bugfix T40082: NLA Meta strips were no longer evaluating correctly

It seems that since the changes to how new NLA strips are handled, accumulating
these in a temporary buffer and then trying to combine the results didn't
work that great anymore.

6 years agoRemove 'Autosmooth' settings from Item 3DView panel.
Bastien Montagne [Thu, 8 May 2014 07:18:19 +0000 (09:18 +0200)]
Remove 'Autosmooth' settings from Item 3DView panel.

Not that happy with this, but this Item panel is a bit stupid, and we could add more
useful settings as well. So better get a design decision first, here.

6 years agoFix T40080: forcefield_toggle_exec() doesn't always enable force field.
Lukas Tönne [Thu, 8 May 2014 06:11:53 +0000 (08:11 +0200)]
Fix T40080: forcefield_toggle_exec() doesn't always enable force field.

Kudos to Brent Baccala for investigating and suggesting a fix.

6 years agoDrivers: When editing expressions from UI buttons, "invalid" flags now get cleared...
Joshua Leung [Thu, 8 May 2014 05:57:11 +0000 (17:57 +1200)]
Drivers: When editing expressions from UI buttons, "invalid" flags now get cleared from the drivers

With this change, there should hopefully be less need to hit "Update Dependencies"
on drivers so often.

6 years agoBugfix: "Lock time to frame range" didn't work in the Graph Editor
Joshua Leung [Thu, 8 May 2014 05:43:11 +0000 (17:43 +1200)]
Bugfix: "Lock time to frame range" didn't work in the Graph Editor

This uses a different operator than the other time editors (as it needs to support
the setting of the value-cursor too), so the changes here didn't get propagated through.

6 years agoCode Cleanup: remove unused m_contactProcessingThreshold
Campbell Barton [Thu, 8 May 2014 04:22:47 +0000 (14:22 +1000)]
Code Cleanup: remove unused m_contactProcessingThreshold

6 years agoRemove unused scons config files
Campbell Barton [Thu, 8 May 2014 04:16:26 +0000 (14:16 +1000)]
Remove unused scons config files

6 years agoAdd missing context member for doc gen
Campbell Barton [Wed, 7 May 2014 21:08:54 +0000 (07:08 +1000)]
Add missing context member for doc gen

6 years agoBGE: Dynamically-allocated action layers
Mitchell Stokes [Thu, 8 May 2014 01:14:36 +0000 (18:14 -0700)]
BGE: Dynamically-allocated action layers

This patch removes the limitations on the number of action layers in the BGE.

BL_ActionManager currently uses a fixed array to keep track of the action layers. This patch replaces the fixed array with a map which allows for dynamic allocation of action layers. Layers (map items) are automatically removed on BL_ActionManager's update function. The maximum number of layers is roughly the value of a short. Backwards functionality is maintained and there are no changes to the Python API.

Task Discussion:

Author: Kevin Ednalino

Reviewers: moguri

Differential Revision:

6 years agoFreestyle: hide the Line Style tab from the Texture properties context when WITH_FREE...
Tamito Kajiyama [Thu, 8 May 2014 01:01:49 +0000 (10:01 +0900)]
Freestyle: hide the Line Style tab from the Texture properties context when WITH_FREESTYLE build flag is off.

6 years agoFreestyle: hide line styles from a scene in the Outliner when WITH_FREESTYLE build...
Tamito Kajiyama [Thu, 8 May 2014 01:00:49 +0000 (10:00 +0900)]
Freestyle: hide line styles from a scene in the Outliner when WITH_FREESTYLE build flag is off.

The Datablocks display mode still shows line style ID datablocks to keep track of line styles
hidden from user interactions in the Properties window.

6 years agoFix for crash when userprefs fails to read.
Campbell Barton [Wed, 7 May 2014 20:35:38 +0000 (06:35 +1000)]
Fix for crash when userprefs fails to read.

6 years agoCode cleanup: spelling/indentation
Campbell Barton [Wed, 7 May 2014 18:53:05 +0000 (04:53 +1000)]
Code cleanup: spelling/indentation

6 years agoFix some nodes showing up as undefined after the fix in 79c345acc21b.
Brecht Van Lommel [Wed, 7 May 2014 18:24:01 +0000 (20:24 +0200)]
Fix some nodes showing up as undefined after the fix in 79c345acc21b.

A bunch of nodes had invalid storage definitions that don't refer to an actual
DNA struct. Ref T40033.

6 years agoFix cycles crash after recent use alpha commit.
Brecht Van Lommel [Wed, 7 May 2014 17:00:15 +0000 (19:00 +0200)]
Fix cycles crash after recent use alpha commit.

6 years agoCycles-Bake: Subsurface Scattering support (fix T40060)
Dalai Felinto [Wed, 7 May 2014 14:55:09 +0000 (11:55 -0300)]
Cycles-Bake: Subsurface Scattering support (fix T40060)

This fixes the SSS Direct/Indirect passes as well as the Combined pass.
Patch reviewed and with fixes and contributions from Brecht van Lommel.

Note: displacement/bump map (related to the report) will be handled separately

Reviewers: brecht

Differential Revision:

6 years agoNodes: add absolute value operation to all math nodes
Matt Heimlich [Wed, 7 May 2014 14:20:17 +0000 (16:20 +0200)]
Nodes: add absolute value operation to all math nodes

Reviewed By: dingto, brecht

Differential Revision:

6 years agoCycles: add support for "Use Alpha" option on image datablocks.
Carlo Andreacchio [Wed, 7 May 2014 14:36:44 +0000 (16:36 +0200)]
Cycles: add support for "Use Alpha" option on image datablocks.

Reviewed By: brecht

Differential Revision:

6 years agoFreestyle: minor code clean-up.
Tamito Kajiyama [Wed, 7 May 2014 14:15:05 +0000 (23:15 +0900)]
Freestyle: minor code clean-up.

6 years agoFreestyle: time/space optimization in stroke rendering without textures.
Tamito Kajiyama [Wed, 7 May 2014 14:14:36 +0000 (23:14 +0900)]
Freestyle: time/space optimization in stroke rendering without textures.

When strokes do not have textures assigned, UV coordinates are not computed now.
This will save a bit of time and space in stroke rendering.

6 years agoFreestyle: debug statistics on stroke rendering.
Tamito Kajiyama [Wed, 7 May 2014 14:08:43 +0000 (23:08 +0900)]
Freestyle: debug statistics on stroke rendering.

6 years agoCycles-Bake: Ambient Occlusion needs to be computed for COMBINED
Dalai Felinto [Wed, 7 May 2014 13:17:56 +0000 (10:17 -0300)]
Cycles-Bake: Ambient Occlusion needs to be computed for COMBINED

Now the COMBINED pass includes the Ambient Occlusion.

This was not reported anywhere, but while working in the Subsurface Scattering I realize we needed this fix for combined.

6 years agoFix T40033: Jumping between versions can lead to loss of node storage
Lukas Tönne [Wed, 7 May 2014 09:42:38 +0000 (11:42 +0200)]
Fix T40033: Jumping between versions can lead to loss of node storage

Saving a file with a new blender node that uses bNode->storage data and
then loading that in an older version will make the node undefined, but
still retain the original type identifier (in case it is defined later).

If the file is then saved over and loaded again in the newer version,
where the node type is defined, it won't have a valid storage struct.
To handle such cases gracefully, check if storage data is expected but
doesn't exist when initializing node types. User then at least get a
chance of fixing the problem manually.

Suggested fix by @brecht.

6 years agoplayanim: check for escape key while loading images
Campbell Barton [Wed, 7 May 2014 08:18:21 +0000 (18:18 +1000)]
playanim: check for escape key while loading images

(todo from 2.4x)

6 years agoFix T40051: Inconsistent dupli vert/face handling of group member types
Campbell Barton [Wed, 7 May 2014 07:11:33 +0000 (17:11 +1000)]
Fix T40051: Inconsistent dupli vert/face handling of group member types

6 years agoFix for dropping images into the 3D View
Campbell Barton [Wed, 7 May 2014 06:53:58 +0000 (16:53 +1000)]
Fix for dropping images into the 3D View
- wasn't allocing image-user.
- wasn't managing user counts.

6 years agoFix T40052, Grid Particles Crash due to invalid empty mesh verts access
Lukas Tönne [Wed, 7 May 2014 05:56:47 +0000 (07:56 +0200)]
Fix T40052, Grid Particles Crash due to invalid empty mesh verts access
for bbox calculation.

6 years agoFix crash binding mdef with no faces
Campbell Barton [Wed, 7 May 2014 04:13:03 +0000 (14:13 +1000)]
Fix crash binding mdef with no faces

6 years agoRemove redundant NULL check
Campbell Barton [Wed, 7 May 2014 03:56:32 +0000 (13:56 +1000)]
Remove redundant NULL check

6 years agoBugfix: Bend modifier's angle property has crazy limits
Joshua Leung [Wed, 7 May 2014 02:18:59 +0000 (14:18 +1200)]
Bugfix: Bend modifier's angle property has crazy limits

As reported by ZanQdo on IRC, the bend modifier's "angle" property had a range
of +/- 572.95 degrees (equivalent to 10 radians). From the looks of things, this
was simply something overlooked when doing degrees to radians conversions. Now
it has a range of +/- 180 degrees.

6 years agoGet rid of custom tooltip for pushdown button
Joshua Leung [Mon, 5 May 2014 03:10:35 +0000 (15:10 +1200)]
Get rid of custom tooltip for pushdown button

6 years agoFreestyle: removed the dummy implementation of a texture manager.
Tamito Kajiyama [Wed, 7 May 2014 01:56:42 +0000 (10:56 +0900)]
Freestyle: removed the dummy implementation of a texture manager.

Legacy texture shaders from the original stand-alone Freestyle program are also
declared as deprecated, in favor of Blender's new line style textures.

Patch contribution by Paolo Acampora.  Thanks!

6 years agoCode cleanup: naming.
Antony Riakiotakis [Tue, 6 May 2014 23:59:23 +0000 (02:59 +0300)]
Code cleanup: naming.

Prepend BKE_ to the functions moved in blenkernel for recent bug fix.

6 years agoFix T39653 crash on drawing modified UVs
Antony Riakiotakis [Tue, 6 May 2014 23:52:08 +0000 (02:52 +0300)]
Fix T39653 crash on drawing modified UVs

Just a case of uninitialized material array.
Make sure object materials are initialized properly when drawing UVs.

This might look strange since we do not really need materials here.
However, the same GPU object may be used in a 3D viewport and if we try
to avoid initializing the materials somehow this will break.

Also, this breaks on full screen UV editor as is apparent from this

6 years agoBake API: force opengl reload and mipmap recalc (fix T40055)
Dalai Felinto [Tue, 6 May 2014 22:12:31 +0000 (19:12 -0300)]
Bake API: force opengl reload and mipmap recalc (fix T40055)

6 years agoBake API: fix T40054 - baked image update on uv/imag editor for linear/float/noncolor...
Dalai Felinto [Tue, 6 May 2014 21:17:21 +0000 (18:17 -0300)]
Bake API: fix T40054 - baked image update on uv/imag editor for linear/float/noncolor, ...

All image colorspaces should be displaying correctly in the UV/Image Editor.

Viewport may still present an issue, but it was reported separately
anyways (T40055)

Patch reviewed (and corrected) by Sergey Sharybin

6 years agoFix issue discovered while investigating T39950:
Antony Riakiotakis [Tue, 6 May 2014 20:30:51 +0000 (23:30 +0300)]
Fix issue discovered while investigating T39950:

Sculpt mode drawing fails after deleting a subsurf modifier
in sculpt mode and undoing.

This was quite difficult to spot. Main cause was that mesh data was not
synchronized properly between undo and sculpt code because we generated
a pbvh on derivedmesh invalidation without really refreshing the rest of
the data. This could result in undo and drawing operating on different

To solve this and avoid bad level calls I had to move quite some code
around. Crazyspace is now moved to blenkernel, as did some sculpt calls
that make sure sculpt data are properly refreshed.

6 years agoStyle cleanup
Campbell Barton [Tue, 6 May 2014 20:11:28 +0000 (06:11 +1000)]
Style cleanup

6 years agoCleanup: redundant NULL checks
Campbell Barton [Tue, 6 May 2014 18:35:55 +0000 (04:35 +1000)]
Cleanup: redundant NULL checks

6 years agoFix possible NULL pointer dereference in Cycles
Campbell Barton [Tue, 6 May 2014 18:18:58 +0000 (04:18 +1000)]
Fix possible NULL pointer dereference in Cycles

6 years agoFix T40049: cycles baking glossy shader looks faceted.
Brecht Van Lommel [Tue, 6 May 2014 16:17:00 +0000 (18:17 +0200)]
Fix T40049: cycles baking glossy shader looks faceted.

Use smooth normal instead of flat normal as view direction.

6 years agoFollowup fix to T39966.
Lukas Tönne [Tue, 6 May 2014 15:44:43 +0000 (17:44 +0200)]
Followup fix to T39966.

The previous fix was not quite correct:
* It would use the same wireframe/bbox check in viewport- and regular render
* The duplicator loop in Blender Internal is more permissive now to avoid disabling wireframe duplicators, but this means we need to check is_object_hidden right before making render objects to ensure this still works.

6 years agoFix T40048: Cycles bake crashes Blender [when there is no image]
Dalai Felinto [Tue, 6 May 2014 14:57:05 +0000 (11:57 -0300)]
Fix T40048: Cycles bake crashes Blender [when there is no image]

The struct with the images was not NULL initialized.

6 years agoOver-optimized stuff in the previous commit, sorry.
Sergey Sharybin [Tue, 6 May 2014 14:55:50 +0000 (16:55 +0200)]
Over-optimized stuff in the previous commit, sorry.

6 years agoFix T39946: OSL + tangent space normal maps not working in Cycles.
Brecht Van Lommel [Tue, 6 May 2014 14:39:28 +0000 (16:39 +0200)]
Fix T39946: OSL + tangent space normal maps not working in Cycles.

6 years agoFixes to previous sculpting tweaks
Sergey Sharybin [Tue, 6 May 2014 14:26:52 +0000 (16:26 +0200)]
Fixes to previous sculpting tweaks

undo didn't work, layer and smooth crashed..

6 years agoMinor tweak to previous commit:
Antony Riakiotakis [Tue, 6 May 2014 14:14:28 +0000 (17:14 +0300)]
Minor tweak to previous commit:

Do not subdivide if user has pressed page down

6 years agoRelated to T39950.
Antony Riakiotakis [Tue, 6 May 2014 13:54:22 +0000 (16:54 +0300)]
Related to T39950.

When in sculpt mode add a multires, not subsurf modifier. Also allow
subdivision of multires when user explicitly requests a certain non-

6 years agoModifier UI: More space for Displace modifier texture ID.
Thomas Dinges [Tue, 6 May 2014 13:01:24 +0000 (15:01 +0200)]
Modifier UI: More space for Displace modifier texture ID.

Was really cluttered sometimes:
Reshuffled layout a bit to avoid this now.

6 years agoCleanup a bit of the locked shape keys painting
Sergey Sharybin [Tue, 6 May 2014 12:49:50 +0000 (14:49 +0200)]
Cleanup a bit of the locked shape keys painting

It's still gives some slowdown when painting a locked
key in the solid view, but since shape key is now longer
being re-used by DM.

but this change should still give some degree of speedup
propagating delta onto the keyblock if i remember the
code correct.

6 years agoFix for uninitialized unit_use_radians variable with inset and bevel
Campbell Barton [Tue, 6 May 2014 09:20:03 +0000 (19:20 +1000)]
Fix for uninitialized unit_use_radians variable with inset and bevel

6 years agoFix for own recent change to menu shortcut behavior
Campbell Barton [Tue, 6 May 2014 08:11:28 +0000 (18:11 +1000)]
Fix for own recent change to menu shortcut behavior

Missed setting the flag for operator-menus.
Now call `ui_but_add_shortcut` to match the rest of the api.

6 years agoFreestyle: minor code clean-up.
Tamito Kajiyama [Tue, 6 May 2014 07:57:07 +0000 (16:57 +0900)]
Freestyle: minor code clean-up.

6 years agoFreestyle: added more conditions to be able to switch to the line style texture prope...
Tamito Kajiyama [Mon, 5 May 2014 10:53:13 +0000 (19:53 +0900)]
Freestyle: added more conditions to be able to switch to the line style texture properties context.

6 years agoCycles: revert part of the optimization from ff34c2d
Campbell Barton [Tue, 6 May 2014 04:07:04 +0000 (14:07 +1000)]
Cycles: revert part of the optimization from ff34c2d

This was faster for my AMD system but slower for Intel.

However with gcc4.9,-O3 I was able to get roughly the same speed before/after.

Revert since this isnt giving such clear benefits on most systems.

6 years agoCorrect fix for knife interior use, distance needed to be in object-space
Campbell Barton [Mon, 5 May 2014 23:32:06 +0000 (09:32 +1000)]
Correct fix for knife interior use, distance needed to be in object-space

6 years agoKnife too: was using a ray-cast direction scaled down by the knife epsilon
Campbell Barton [Mon, 5 May 2014 23:02:16 +0000 (09:02 +1000)]
Knife too: was using a ray-cast direction scaled down by the knife epsilon

6 years agoFix T38623: Knife tool completely failing on interior geometry
Campbell Barton [Mon, 5 May 2014 22:34:36 +0000 (08:34 +1000)]
Fix T38623: Knife tool completely failing on interior geometry

6 years agoProper fix for CMake files
Sergey Sharybin [Mon, 5 May 2014 22:03:45 +0000 (04:03 +0600)]
Proper fix for CMake files

next time you're deprecating some platform, compiler, feature just either
mail in the ML telling about this or if you're not that lazy poke developers
online whether then can spot issues quick.

Or be ready to pick up stuff being done by the developers your change gives
headache to.

6 years agoCMake: Edit recent commit, allow 64bit msvc2008
Campbell Barton [Mon, 5 May 2014 20:13:07 +0000 (06:13 +1000)]
CMake: Edit recent commit, allow 64bit msvc2008

6 years agoCMake: mark vars as advanced
Campbell Barton [Mon, 5 May 2014 20:03:52 +0000 (06:03 +1000)]
CMake: mark vars as advanced

6 years agoFix T39956.
Antony Riakiotakis [Mon, 5 May 2014 19:39:55 +0000 (22:39 +0300)]
Fix T39956.

Even locked shape keys need to be flushed if user is in textured or
wireframe mode.

6 years agoHidden PBVH nodes:
Antony Riakiotakis [Mon, 5 May 2014 19:21:30 +0000 (22:21 +0300)]
Hidden PBVH nodes:

Set hidden when rebuilding the PBVH tree if all primitives are hidden.

6 years agoDrop support for MSVC versions older then 2013 with CMake
Campbell Barton [Mon, 5 May 2014 19:03:19 +0000 (05:03 +1000)]
Drop support for MSVC versions older then 2013 with CMake

We get too many complaints about breakage and we intend to drop older versions soon anyway.

6 years agoMake bpy.types.EditBone.matrix writeable.
Bastien Montagne [Mon, 5 May 2014 18:56:38 +0000 (20:56 +0200)]
Make bpy.types.EditBone.matrix writeable.

Makes importing armatures from matrices (FBX...) *much* easier.

6 years agoInstall_deps: explicitely disable OSL/LLVM seems needed...
Bastien Montagne [Mon, 5 May 2014 18:46:30 +0000 (20:46 +0200)]
Install_deps: explicitely disable OSL/LLVM seems needed...

6 years agoAttempt to solve T39950,
Antony Riakiotakis [Mon, 5 May 2014 18:13:27 +0000 (21:13 +0300)]
Attempt to solve T39950,

Avoid filling up buffers when total buffer triangles are zero.

Better still would be to tag a node as hidden when doing recreation of
the PBVH tree by checking for any visible elements. Original bug report
probably has to do with OpenGL doing something funky but hidden nodes
should be tagged as hidden to completely avoid iterating for painting.
This is to be done in a later commit.

Also some naming cleanup for consistency, GPU_build_pbvh_mesh_buffers to

6 years agoFix T39322, hair not rendered in rendered mode viewport after returning
Antony Riakiotakis [Mon, 5 May 2014 16:51:58 +0000 (19:51 +0300)]
Fix T39322, hair not rendered in rendered mode viewport after returning
from particle edit mode.

Check for object particle edit mode, not psys->edit. This won't get
freed on exit (which might be worth considering doing, maybe?)

6 years agoFix T40032: hair BSDF not working correct after primitive type code refactoring.
Brecht Van Lommel [Mon, 5 May 2014 15:14:46 +0000 (17:14 +0200)]
Fix T40032: hair BSDF not working correct after primitive type code refactoring.

6 years agoFix T40031: cycles deformation motion blur wrong render on last frame of animation.
Brecht Van Lommel [Mon, 5 May 2014 14:35:20 +0000 (16:35 +0200)]
Fix T40031: cycles deformation motion blur wrong render on last frame of animation.

6 years agoAnother attempt to fully fix T40020: Freestyle: dashed lines crashes blender.
Tamito Kajiyama [Mon, 5 May 2014 13:30:00 +0000 (22:30 +0900)]
Another attempt to fully fix T40020: Freestyle: dashed lines crashes blender.

Problem report by flokkievids through rB047c3aa728a4bb944616a084805988714b796d52#1.

6 years agoFreestyle: Revised a UI text for better understandability in the Outliner.
Tamito Kajiyama [Mon, 5 May 2014 07:40:31 +0000 (16:40 +0900)]
Freestyle: Revised a UI text for better understandability in the Outliner.

6 years agoFix T40029: Apply transform to empties reset their location
Campbell Barton [Mon, 5 May 2014 05:41:08 +0000 (15:41 +1000)]
Fix T40029: Apply transform to empties reset their location

also add check for negative scale

6 years agoStop all dynamic enums using translations (from blend file data)
Campbell Barton [Mon, 5 May 2014 05:22:36 +0000 (15:22 +1000)]
Stop all dynamic enums using translations (from blend file data)

6 years agoFix: T40016 ID Names translated in menus
Campbell Barton [Mon, 5 May 2014 05:09:29 +0000 (15:09 +1000)]
Fix: T40016 ID Names translated in menus

6 years agoFix T40020: Freestyle: dashed lines crashes blender.
Tamito Kajiyama [Mon, 5 May 2014 02:32:43 +0000 (11:32 +0900)]
Fix T40020: Freestyle: dashed lines crashes blender.

The crash was due to an out-of-range vertex index reference that occured while
computing texture coordinates of strokes with tips.

6 years agoCode cleanup
Campbell Barton [Mon, 5 May 2014 02:29:28 +0000 (12:29 +1000)]
Code cleanup

6 years agoNLA Pushdown Operator: Active animdata option + More error handling
Joshua Leung [Mon, 5 May 2014 02:15:28 +0000 (14:15 +1200)]
NLA Pushdown Operator: Active animdata option + More error handling

* If channel_index = -1, the pushdown operator will try to use the active AnimData
  block. To see which one this will be, check the properties (NKEY) region in NLA Editor.
* Added more detailed error handling for the various cases where things are not
  in a valid state for pushing down an action. This is notably to stop scripters
  from putting the NLA into an inconsistent state.

6 years agoNLA Editor: Added dedicated operator for the pushdown operation
Joshua Leung [Mon, 5 May 2014 01:59:36 +0000 (13:59 +1200)]
NLA Editor: Added dedicated operator for the pushdown operation

6 years agoCode Cleanup: Remove old deprecated NLA channel drawing code
Joshua Leung [Mon, 5 May 2014 00:49:26 +0000 (12:49 +1200)]
Code Cleanup: Remove old deprecated NLA channel drawing code

6 years agoNLA Editor: Polishing a few rough edges with the cleanup
Joshua Leung [Mon, 5 May 2014 00:49:11 +0000 (12:49 +1200)]
NLA Editor: Polishing a few rough edges with the cleanup

6 years agoNLA Editor: Second part of porting NLA Action channel to standard drawing system
Joshua Leung [Sun, 4 May 2014 15:32:23 +0000 (03:32 +1200)]
NLA Editor: Second part of porting NLA Action channel to standard drawing system

This now works (barring one or two minor glitches and the operator on the pushdown
button being a bit of a hack). The old drawing code is still in place though, and
will be kept around for a little while yet while the last kinks are ironed out.

6 years agoNLA Editor Drawing: Set up AnimChannelType callbacks for drawing NLA Editor
Joshua Leung [Sun, 4 May 2014 14:57:36 +0000 (02:57 +1200)]
NLA Editor Drawing: Set up AnimChannelType callbacks for drawing NLA Editor

This commit lays some of the groundwork needed to port the last of the NLA Editor
channel types that's still defined using custom code. By moving this code over
to the newer standardised framework, this will enable widgets to have tooltips
to make it easier for users to find out what various buttons do.

Currently this isn't hooked up to anything though.

6 years agoFix T39928: Blender crash/freeze when game engine is started with animation played...
Mitchell Stokes [Sun, 4 May 2014 22:37:18 +0000 (15:37 -0700)]
Fix T39928: Blender crash/freeze when game engine is started with animation played directly on camera object with parents.

Updating object IPOs is not currently thread-safe since it also updates
children. This leads to problems when parents and children are both
animated. For now, updating object IPOs is done in its own loop to avoid
threading issues.

6 years agoAdd check for LIKELY/UNLIKELY is CPU only
Campbell Barton [Sun, 4 May 2014 21:26:49 +0000 (07:26 +1000)]
Add check for LIKELY/UNLIKELY is CPU only

6 years agoCycles: avoid int->float conversions for pixel lookups
Campbell Barton [Sun, 4 May 2014 20:57:33 +0000 (06:57 +1000)]
Cycles: avoid int->float conversions for pixel lookups

Gives ~3% speedup for image.blend test, and 6% for image heavy file.

Overall speedup in real-world use is likely much less.

6 years agoFix T40025: generating wrong make flag for OSL
Bastien Montagne [Sun, 4 May 2014 19:32:06 +0000 (21:32 +0200)]
Fix T40025: generating wrong make flag for OSL

Most cases should be handled OK now (not all though, would make script way too much tricky -
bash is a hell of a messy language :/).

6 years agoCycles: use LIKELY/UNLIKELY macros
Campbell Barton [Sun, 4 May 2014 17:49:22 +0000 (03:49 +1000)]
Cycles: use LIKELY/UNLIKELY macros

Gives overall ~3% speedup in own tests for BMW scene.

6 years agoStyle cleanup: indentation, braces
Campbell Barton [Sun, 4 May 2014 16:19:08 +0000 (02:19 +1000)]
Style cleanup: indentation, braces

6 years agoCode cleanup: avoid int/uint mixup in cycles
Campbell Barton [Sun, 4 May 2014 15:30:02 +0000 (01:30 +1000)]
Code cleanup: avoid int/uint mixup in cycles