5 years agoCycles: add Transparent Depth output to Light Path node.
Carlo Andreacchio [Mon, 21 Apr 2014 12:20:29 +0000 (14:20 +0200)]
Cycles: add Transparent Depth output to Light Path node.

This can for example be useful if you want to manually terminate the path at
some point and use a color other than black.

Reviewed By: brecht

Differential Revision:

5 years agoCode cleanup: add some asserts and fix a typo in BVH build.
John Pavel [Mon, 21 Apr 2014 12:06:29 +0000 (14:06 +0200)]
Code cleanup: add some asserts and fix a typo in BVH build.

Reviewed By: brecht

Differential Revision:

5 years agoFix new Cycles UV Map node not working correct for bump mapping.
Kevin Dietrich [Mon, 21 Apr 2014 11:15:45 +0000 (13:15 +0200)]
Fix new Cycles UV Map node not working correct for bump mapping.

Reviewed By: brecht

Differential Revision:

5 years agoObject drawing: test the flag, without comparing the value
Campbell Barton [Mon, 21 Apr 2014 09:26:37 +0000 (19:26 +1000)]
Object drawing: test the flag, without comparing the value

5 years agoSplit Normals: more fix for EditMode shading and modifiers (subsurf special case...
Bastien Montagne [Mon, 21 Apr 2014 08:20:44 +0000 (10:20 +0200)]
Split Normals: more fix for EditMode shading and modifiers (subsurf special case, this time).

CCGDM did not generate a valid tessellated loop normals CD layer...

5 years agoCode cleanup: view2d api naming
Campbell Barton [Mon, 21 Apr 2014 08:46:52 +0000 (18:46 +1000)]
Code cleanup: view2d api naming

5 years agoLibmv: optimization of PearsonProductMomentCorrelation
Sergey Sharybin [Mon, 21 Apr 2014 08:26:06 +0000 (14:26 +0600)]
Libmv: optimization of PearsonProductMomentCorrelation

Pass the arrays by reference rather than by value,
should give some percent of speedup.

Also don't pass the dimensions to the function but
get them from the images themselves.

Hopefully this will give some %% of tracker speedup.

5 years agoFix player build.
Bastien Montagne [Mon, 21 Apr 2014 08:18:51 +0000 (10:18 +0200)]
Fix player build.

5 years agoView2d: check UI_view2d_view_to_region_clip succeeds before using the result
Campbell Barton [Mon, 21 Apr 2014 08:11:47 +0000 (18:11 +1000)]
View2d: check UI_view2d_view_to_region_clip succeeds before using the result

5 years agoView2d: API Cleanup for view<->region conversion
Campbell Barton [Mon, 21 Apr 2014 06:47:16 +0000 (16:47 +1000)]
View2d: API Cleanup for view<->region conversion

View2D had some inconsistencies making it error prone in some cases.

- Inconstant checking for NULL x/y args.
  Disallow NULL args for x/y destination pointers, instead add:
  - UI_view2d_region_to_view_x/y
  - UI_view2d_view_to_region_x/y

- '_no_clip' suffix wasn't always used for non-clipping conversion,
  switch it around and use a '_clip' suffix for all funcs that clip.

- UI_view2d_text_cache_add now clips before adding cache.

- '_clip' funcs return a bool to quickly check if its in the view.

- add conversion for rectangles, since this is a common task:
  - UI_view2d_view_to_region_rcti
  - UI_view2d_region_to_view_rctf

5 years agoFix T39818: Strips from file with long filename broke auto-naming - animation can...
Bastien Montagne [Mon, 21 Apr 2014 06:30:20 +0000 (08:30 +0200)]
Fix T39818: Strips from file with long filename broke auto-naming - animation can't be apply on it.

5 years agoFix for UI_view2d_to_region_float (was ignoring x,y args)
Campbell Barton [Mon, 21 Apr 2014 04:30:13 +0000 (14:30 +1000)]
Fix for UI_view2d_to_region_float (was ignoring x,y args)

use this for grease pencil stroke conversion to avoid float->int->float conversion.

5 years agoSkin mark/clear: replace GHash with GSet
Campbell Barton [Mon, 21 Apr 2014 03:10:38 +0000 (13:10 +1000)]
Skin mark/clear: replace GHash with GSet

5 years agoFix stupid typo that broke split normal shading in edit mode, when there was some...
Bastien Montagne [Sun, 20 Apr 2014 21:12:18 +0000 (23:12 +0200)]
Fix stupid typo that broke split normal shading in edit mode, when there was some deform modifiers.

5 years agoFix incorrect ghash free
Campbell Barton [Sun, 20 Apr 2014 18:00:35 +0000 (04:00 +1000)]
Fix incorrect ghash free

5 years agoGHash, EdgeHash: hint on unlikely branch
Campbell Barton [Sun, 20 Apr 2014 16:50:07 +0000 (02:50 +1000)]
GHash, EdgeHash: hint on unlikely branch

also avoid searching buckets for empty hashes

5 years agoCorrect cast from recent bool changes
Campbell Barton [Sun, 20 Apr 2014 16:48:39 +0000 (02:48 +1000)]
Correct cast from recent bool changes

5 years agoCode cleanup: correct abs use
Campbell Barton [Sun, 20 Apr 2014 15:54:52 +0000 (01:54 +1000)]
Code cleanup: correct abs use

also minor cleanup to rotation code

5 years agoCode cleanup: style
Campbell Barton [Sun, 20 Apr 2014 12:05:05 +0000 (22:05 +1000)]
Code cleanup: style

5 years agoNodes: make default group nodes slighly wider, to match other node width defaults.
Brecht Van Lommel [Sun, 20 Apr 2014 12:36:09 +0000 (14:36 +0200)]
Nodes: make default group nodes slighly wider, to match other node width defaults.

5 years agoFix error making datablock with fake user local, the user count would be wrong afterw...
Brecht Van Lommel [Sun, 20 Apr 2014 12:33:27 +0000 (14:33 +0200)]
Fix error making datablock with fake user local, the user count would be wrong afterwards.

5 years agoMath Lib: faster version of rotation_between_vecs_to_mat3
Campbell Barton [Sun, 20 Apr 2014 10:56:09 +0000 (20:56 +1000)]
Math Lib: faster version of rotation_between_vecs_to_mat3

Use axis/angle calculation but avoid calls to sin/cos

5 years agoBGE: Fixing memory leaks when deactivating Sensors, Controllers, or actuators.
Mitchell Stokes [Sat, 19 Apr 2014 21:51:29 +0000 (14:51 -0700)]
BGE: Fixing memory leaks when deactivating Sensors, Controllers, or actuators.

Found by Coverity and confirmed with Valgrind.

5 years agoMath Lib: add shell_v3v3_normalized_to_dist and v2 version
Campbell Barton [Sat, 19 Apr 2014 12:12:50 +0000 (22:12 +1000)]
Math Lib: add shell_v3v3_normalized_to_dist and v2 version

bypass angle calculation to avoids (asin, sqrt, cos).

5 years agoBullet: making bullet friction workaround more furureproof by using the __apple_build...
Jens Verwiebe [Sat, 19 Apr 2014 12:10:49 +0000 (14:10 +0200)]
Bullet: making bullet friction workaround more furureproof by using the __apple_build_version__ macro, TODO: check if problem persists with newer clang

5 years agoMinor change to recent commit (avoid transpose)
Campbell Barton [Sat, 19 Apr 2014 09:48:07 +0000 (19:48 +1000)]
Minor change to recent commit (avoid transpose)

5 years agoMath Lib: minor optimization to barycentric_transform
Campbell Barton [Sat, 19 Apr 2014 05:50:41 +0000 (15:50 +1000)]
Math Lib: minor optimization to barycentric_transform

replace rotation_between_vecs_to_quat with axis_dominant_v3_to_m3.

5 years agoMath Lib: add rotation_between_vecs_to_mat3
Campbell Barton [Sat, 19 Apr 2014 05:36:47 +0000 (15:36 +1000)]
Math Lib: add rotation_between_vecs_to_mat3

- behaves like rotation_between_vecs_to_quat
- avoids calling sin,cos calls (approx 1.6x faster).

5 years agoMath Lib: minor optimization for axis_angle_normalized_to_mat3
Campbell Barton [Sat, 19 Apr 2014 04:09:55 +0000 (14:09 +1000)]
Math Lib: minor optimization for axis_angle_normalized_to_mat3

5 years agoDisable quicktime when in cmake's lite configuration
Campbell Barton [Fri, 18 Apr 2014 13:20:51 +0000 (23:20 +1000)]
Disable quicktime when in cmake's lite configuration

5 years agoCycles: SVM optimization for mix shaders, to skip more code when the mix weight
Brecht Van Lommel [Fri, 18 Apr 2014 11:40:30 +0000 (13:40 +0200)]
Cycles: SVM optimization for mix shaders, to skip more code when the mix weight
for one of the input shaders is zero.

This gives about 5% speedup for koro_final.blend. In general this is important
so you can design shaders that run faster for shadows, diffuse bounces, etc, for
example by skipping procedural textures or even using a single fixed color.

5 years agoFix cycles using acosf in panorama render when it should use safe_acosf.
Brecht Van Lommel [Thu, 17 Apr 2014 12:49:57 +0000 (14:49 +0200)]
Fix cycles using acosf in panorama render when it should use safe_acosf.

5 years agoChange Vector.slerp to accept nonunit vectors
Campbell Barton [Fri, 18 Apr 2014 10:44:50 +0000 (20:44 +1000)]
Change Vector.slerp to accept nonunit vectors

5 years agoCMake was missing header
Campbell Barton [Fri, 18 Apr 2014 10:32:50 +0000 (20:32 +1000)]
CMake was missing header

5 years agoFreestyle: minor changes to the UI layout of line style options.
Tamito Kajiyama [Fri, 18 Apr 2014 06:11:20 +0000 (15:11 +0900)]
Freestyle: minor changes to the UI layout of line style options.

Toggle buttons are now placed to the left of those labels separating sets of line style
options, so as to save some space (in line with the new UI elements added in the
commit f60a66f41784de388a01c4c882c969730d675375).

5 years agoCode cleanup: de-duplicated includes.
Tamito Kajiyama [Fri, 18 Apr 2014 06:01:12 +0000 (15:01 +0900)]
Code cleanup: de-duplicated includes.

5 years agoFreestyle: New options for sorting to arrange the stacking order of lines.
Tamito Kajiyama [Fri, 18 Apr 2014 05:59:02 +0000 (14:59 +0900)]
Freestyle: New options for sorting to arrange the stacking order of lines.

Line styles now have a set of new options for rearranging the stacking order of lines.
This gives artists more control to determine which lines should be drawn on top of others.
Two available sort keys are the distance from camera and curvilinear 2D length.
Since the distance of a line from camera may vary over vertices, another option called
integration type is used to compute the sort key for a line from the values computed at
individual vertices.  Available integration types are MEAN, MIN, MAX, FIRST and LAST
(see the tool tips for more detail).

5 years agoFreestyle: Added logical operators for binary predicates for 1D elements.
Tamito Kajiyama [Fri, 18 Apr 2014 04:57:10 +0000 (13:57 +0900)]
Freestyle: Added logical operators for binary predicates for 1D elements.

The implemented operators are:

5 years agoQuite compiler warnings.
Tamito Kajiyama [Fri, 18 Apr 2014 00:25:36 +0000 (09:25 +0900)]
Quite compiler warnings.

5 years agoFreestyle: Fix ImportError in
IRIE Shinsuke [Thu, 17 Apr 2014 23:48:03 +0000 (08:48 +0900)]
Freestyle: Fix ImportError in

5 years agoCycles Standalone: Use progressive refine in background mode too.
Thomas Dinges [Thu, 17 Apr 2014 21:16:12 +0000 (23:16 +0200)]
Cycles Standalone: Use progressive refine in background mode too.

This is only a workaround, with tiled rendering the image output has a wrong aspect ratio. (squashed image)

5 years agoDyntopo: Solve issue with test file by Jens.
Antony Riakiotakis [Thu, 17 Apr 2014 21:11:05 +0000 (00:11 +0300)]
Dyntopo: Solve issue with test file by Jens.

Seems like custom data indices can be mangled when many layers are
present in the mesh, so use more strict calculation of offset (copied
over from BM_CD_LAYER_ID).

I was under the impression that all custom data would be deleted on
entering dyntopo, it seems this is not the case though.

5 years agoMake sure we invalidate the node ID layer each time the PBVH is reset.
Antony Riakiotakis [Thu, 17 Apr 2014 17:53:20 +0000 (20:53 +0300)]
Make sure we invalidate the node ID layer each time the PBVH is reset.

It makes code more tidy (avoids having to call invalidation on a myriad
places). Also makes sure other invalidation cases (some mesh change,
e.g.) work as expected.

5 years agoRe-bundle Libmv to be sure it's all fine
Sergey Sharybin [Thu, 17 Apr 2014 17:31:57 +0000 (23:31 +0600)]
Re-bundle Libmv to be sure it's all fine

5 years agoFix for 771a9dd: libmv build files are automatically generated
Sergey Sharybin [Thu, 17 Apr 2014 16:36:07 +0000 (22:36 +0600)]
Fix for 771a9dd: libmv build files are automatically generated

This means if one makes change to either SConscript or CMakeLists.txt
there he MUST update

Also made it so *.cc files from intern/libmv are matching which would
make it easier to add more .cc files there if needed.

And one more thing is removing 'simple_pipeline/'
which doesn't match any of the files.

5 years agoRevised freestyle.predicates.pyZBP1D so that the constructor accepts an integration...
Tamito Kajiyama [Thu, 17 Apr 2014 16:24:11 +0000 (01:24 +0900)]
Revised freestyle.predicates.pyZBP1D so that the constructor accepts an integration type.

5 years agoBI: cleanup in autosmooth area.
Bastien Montagne [Thu, 17 Apr 2014 14:22:25 +0000 (16:22 +0200)]
BI: cleanup in autosmooth area.

5 years agoOptimize and symmetrize operators missed reset of node layer.
Antony Riakiotakis [Thu, 17 Apr 2014 16:12:05 +0000 (19:12 +0300)]
Optimize and symmetrize operators missed reset of node layer.

5 years agoRefactor to Dyntopo node customdata commit.
Antony Riakiotakis [Thu, 17 Apr 2014 16:02:55 +0000 (19:02 +0300)]
Refactor to Dyntopo node customdata commit.

Don't use a dedicated node layer but use temporary int layer instead.
Works like a charm as long as we are careful resetting the layer when
needed (after pbvh clearing and always after bmesh has been filled in

Tip by Campbell, thanks!

5 years agoRecreating a bmesh log did not account for modified faces.
Antony Riakiotakis [Thu, 17 Apr 2014 15:55:53 +0000 (18:55 +0300)]
Recreating a bmesh log did not account for modified faces.

It shouldn't create issues in practice because modified face ids should
have been reclaimed from an added face on a previous entry, but add for

5 years agoLbmv: fix scons compile after ed2ddc9
Jens Verwiebe [Thu, 17 Apr 2014 15:00:29 +0000 (17:00 +0200)]
Lbmv: fix scons compile after ed2ddc9

5 years agoView3D: use smoothview for localview switching
Campbell Barton [Thu, 17 Apr 2014 12:54:10 +0000 (22:54 +1000)]
View3D: use smoothview for localview switching

5 years agoCode cleanup: use const for array args
Campbell Barton [Thu, 17 Apr 2014 11:14:34 +0000 (21:14 +1000)]
Code cleanup: use const for array args

5 years agoView3D: no need to mask mask out localview for each object
Campbell Barton [Thu, 17 Apr 2014 10:38:21 +0000 (20:38 +1000)]
View3D: no need to mask mask out localview for each object

5 years agoAdd missing node update in dyntopo flood fill.
Antony Riakiotakis [Thu, 17 Apr 2014 13:03:14 +0000 (16:03 +0300)]
Add missing node update in dyntopo flood fill.

5 years agoFix T39765 crash on text with generative modifiers.
Antony Riakiotakis [Thu, 17 Apr 2014 12:58:40 +0000 (15:58 +0300)]
Fix T39765 crash on text with generative modifiers.

5 years agoFix compilation issue.
Antony Riakiotakis [Thu, 17 Apr 2014 12:53:11 +0000 (15:53 +0300)]
Fix compilation issue.

5 years agoFix T39771: Armature Tools and Options Panel appears in other TABs.
Bastien Montagne [Thu, 17 Apr 2014 12:50:06 +0000 (14:50 +0200)]
Fix T39771: Armature Tools and Options Panel appears in other TABs.

5 years agoFix another Freestyle building glitch.
Bastien Montagne [Thu, 17 Apr 2014 12:39:13 +0000 (14:39 +0200)]
Fix another Freestyle building glitch.

5 years agoAttempt to fix one more issue with Freestyle compilation
Sergey Sharybin [Thu, 17 Apr 2014 12:46:19 +0000 (18:46 +0600)]
Attempt to fix one more issue with Freestyle compilation

5 years agoFix crash when enabling undistorted display in MCE
Sergey Sharybin [Thu, 17 Apr 2014 12:01:45 +0000 (18:01 +0600)]
Fix crash when enabling undistorted display in MCE

5 years agoSupport multiple distortion models, including a new division model
Sergey Sharybin [Thu, 20 Feb 2014 13:41:05 +0000 (19:41 +0600)]
Support multiple distortion models, including a new division model

This commit makes it so CameraIntrinsics is no longer hardcoded
to use the traditional polynomial radial distortion model. Currently
the distortion code has generic logic which is shared between
different distortion models, but had no other models until now.

This moves everything specific to the polynomial radial distortion
to a subclass PolynomialDistortionCameraIntrinsics(), and adds a
new division distortion model suitable for cameras such as the
GoPro which have much stronger distortion due to their fisheye lens.

This also cleans up the internal API of CameraIntrinsics to make
it easier to understand and reduces old C-style code.

New distortion model is available in the Lens panel of MCE.

- Polynomial is the old well-known model
- Division is the new one which s intended to deal better with huge

Coefficients of this model works independent from each other
and for division model one probably want to have positive values
to have a barrel distortion.

5 years agoCycles CUDA: don't use cuLaunchGridAsync at all for display devices.
Brecht Van Lommel [Thu, 17 Apr 2014 10:18:49 +0000 (12:18 +0200)]
Cycles CUDA: don't use cuLaunchGridAsync at all for display devices.

As suggested by Martijn, this is slower than cuLaunchGrid.

5 years agoCycles CUDA: only do async execution for GPUs not used for display.
Brecht Van Lommel [Thu, 17 Apr 2014 09:59:05 +0000 (11:59 +0200)]
Cycles CUDA: only do async execution for GPUs not used for display.

Otherwise devices used for display will lock up the UI too much. This means
you might still get 100% CPU for the display device, but for others CPU usage
should be low still.

The check to see if a device is used for display may not be entirely reliable,
it checks if there is a watchdog timeout on the device, but I'm not entirely
sure that always exists for display devices or is disabled for non-display
devices, though some tools like cuda-gdb seem to make the same assumption.

Ref T39559

5 years agoFix compilation error of Freestyle
Sergey Sharybin [Thu, 17 Apr 2014 10:04:01 +0000 (16:04 +0600)]
Fix compilation error of Freestyle

Seems to be some sort of namespace conflict or so which is
solved by reshuffling the includes a bit.

5 years agoStyle cleanup
Campbell Barton [Thu, 17 Apr 2014 10:00:49 +0000 (20:00 +1000)]
Style cleanup

5 years agoCode cleanup: use bools for DM
Campbell Barton [Thu, 17 Apr 2014 09:33:54 +0000 (19:33 +1000)]
Code cleanup: use bools for DM

5 years agoFix error in last commit
Campbell Barton [Thu, 17 Apr 2014 10:02:56 +0000 (20:02 +1000)]
Fix error in last commit

5 years agoFix T39758: Blender Crash when removing pinned Scene.
Bastien Montagne [Thu, 17 Apr 2014 08:48:32 +0000 (10:48 +0200)]
Fix T39758: Blender Crash when removing pinned Scene.

5 years agoFix T39766: bone calculation from edit mode goes wrong
Bastien Montagne [Thu, 17 Apr 2014 08:19:32 +0000 (10:19 +0200)]
Fix T39766: bone calculation from edit mode goes wrong

Own logic error in previous commit...

5 years agoFix mistake in recent DM material changes
Campbell Barton [Thu, 17 Apr 2014 08:05:57 +0000 (18:05 +1000)]
Fix mistake in recent DM material changes

5 years agoViewport Text Drawing: replace single allocs with a memarena
Campbell Barton [Thu, 17 Apr 2014 05:14:07 +0000 (15:14 +1000)]
Viewport Text Drawing: replace single allocs with a memarena

- pass label strlen since in many cases its already known.
- use single linked list for cached text drawing.
- add BLI_link_utils.h for single linked list macros.

own tests give approx 22% overall speedup.

5 years agoCode cleanup: use bools
Campbell Barton [Thu, 17 Apr 2014 03:46:34 +0000 (13:46 +1000)]
Code cleanup: use bools

also rename BLI_omp_thread_count -> BLI_system_thread_count_omp

5 years agoFreestyle: removed unnecessary #include "FreestyleConfig.h".
Tamito Kajiyama [Thu, 17 Apr 2014 05:31:35 +0000 (14:31 +0900)]
Freestyle: removed unnecessary #include "FreestyleConfig.h".

5 years agoFreestyle: removed unused *_EXPORT qualifiers for building Windows DLLs.
Tamito Kajiyama [Thu, 17 Apr 2014 05:19:10 +0000 (14:19 +0900)]
Freestyle: removed unused *_EXPORT qualifiers for building Windows DLLs.

These qualifiers were leftovers of the stand alone Freestyle program and not used
(set to an empty string) in Blender for years.

5 years agoFix for missing changes in commit 6b0b6f876a4d68acd5c9252270a5135d0308d782.
Tamito Kajiyama [Thu, 17 Apr 2014 03:57:39 +0000 (12:57 +0900)]
Fix for missing changes in commit 6b0b6f876a4d68acd5c9252270a5135d0308d782.

5 years agoReplaced assert() with BLI_assert().
Tamito Kajiyama [Thu, 17 Apr 2014 03:55:17 +0000 (12:55 +0900)]
Replaced assert() with BLI_assert().

5 years agoFreestyle: removed unnecessary #include files and made minor code cleanup.
Tamito Kajiyama [Thu, 17 Apr 2014 03:45:22 +0000 (12:45 +0900)]
Freestyle: removed unnecessary #include files and made minor code cleanup.

5 years agoFreestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 4).
Tamito Kajiyama [Thu, 17 Apr 2014 03:43:11 +0000 (12:43 +0900)]
Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 4).

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Fix for a C++ scope issue caused by 'using namespace Freestyle' that was assumed
even within the Freestyle namespace definition.

5 years agoFreestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 3).
Tamito Kajiyama [Thu, 17 Apr 2014 03:37:08 +0000 (12:37 +0900)]
Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 3).

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Made changes to intern/view_map/Interface0D.h and intern/python/Director.h to
avoid #include <Python.h> and keep non-Python header files independent of it.

5 years agoFreestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2).
Tamito Kajiyama [Thu, 17 Apr 2014 03:25:41 +0000 (12:25 +0900)]
Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2).

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Fixed for #include <Python.h> not properly put in the extern "C" { ... } construct.

Also removed redundant inclusion of the header file in the Freestyle Python API code.

5 years agoFreestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 1).
Tamito Kajiyama [Thu, 17 Apr 2014 03:01:10 +0000 (12:01 +0900)]
Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 1).

The issue was caused by including both Python.h and BLI_math.h.  Since the macro
definition in Python.h was unconditional, it was necessary to include it first and then

Addressing the issue turned out to affect many Freestyle source files.  There were several
other coding flaws that complicated the situation:

1. intern/system/FreestyleConfig.h was abused just to include BLI_math.h which was in
fact unnecessary in FreestyleConfig.h.  While addressing this, inclusion of both math.h
and BLI_math.h had to be duly dealt with to avoid a compiler error about round().

2. #include <Python.h> was not properly put in the extern "C" { ... } construct.

3. intern/view_map/Interface0D.h and intern/python/Director.h, both of which included
Python.h, were included from within Freestyle header files that were almost or completely
independent of Python.  These non-Python header files were used everywhere in the
Freestyle code base, causing many cases of the reported macro redefinitions.

4. The Director.h file was also declaring 'using namespace Freestyle', which was causing
another scope issue in several Freestyle header files.

This commit is intended to address the first problem above.  Subsequent commits will deal
with the other three.

5 years agoFix T39767: Parent in Mask mode crashes
Campbell Barton [Thu, 17 Apr 2014 03:23:16 +0000 (13:23 +1000)]
Fix T39767: Parent in Mask mode crashes

5 years agoFix T39768: GLOBAL_X/Y/Z don't exist for bpy.ops.armature.calculate_roll type enum
Joshua Leung [Thu, 17 Apr 2014 03:02:03 +0000 (15:02 +1200)]
Fix T39768: GLOBAL_X/Y/Z don't exist for bpy.ops.armature.calculate_roll type enum

5 years agoBGE - button for deactivate sensors, controllers and actuators
Jorge Bernal [Thu, 17 Apr 2014 01:23:29 +0000 (22:23 -0300)]
BGE - button for deactivate sensors, controllers and actuators

This change introduces a new checkbox to deactivate the sensors, controllers and/or actuators. It is useful during the development phase to avoid delete sensors, controllers or actuators if you want to test something new.

NOC: The wiki page is being updated (the images mostly), but the feature is already in the 2.71 release log.


Reviewers: moguri, dfelinto, campbellbarton, dingto, #user_interface, billrey

Reviewed By: moguri

CC: billrey
Differential Revision:

5 years agoBullet: better workaround for failing friction with clang 3.4, remove the obsolete...
Jens Verwiebe [Wed, 16 Apr 2014 22:25:15 +0000 (00:25 +0200)]
Bullet: better workaround for failing friction with clang 3.4, remove the obsolete compileflag magic

5 years agoFix another compile error with recent commit on visual studio.
Brecht Van Lommel [Wed, 16 Apr 2014 19:36:19 +0000 (21:36 +0200)]
Fix another compile error with recent commit on visual studio.

5 years agoFix for scons/CUDA build after recent commit.
Brecht Van Lommel [Wed, 16 Apr 2014 19:23:37 +0000 (21:23 +0200)]
Fix for scons/CUDA build after recent commit.

5 years agoCycles CUDA: enabled branched path kernel again, with more registers.
Brecht Van Lommel [Wed, 16 Apr 2014 17:08:37 +0000 (19:08 +0200)]
Cycles CUDA: enabled branched path kernel again, with more registers.

5 years agoCycles code refactor: use __launch_bounds__ instead of -maxrregcount for CUDA.
Brecht Van Lommel [Wed, 16 Apr 2014 17:04:58 +0000 (19:04 +0200)]
Cycles code refactor: use __launch_bounds__ instead of -maxrregcount for CUDA.

This makes it easier to have per kernel number of registers. Also, all the
tunable parameters for this are now in, rather than spread over cmake,
scons and device_cuda.cpp.

5 years agoFix Knife bug T39617: midpoint snap should affect intermediate points.
Howard Trickey [Wed, 16 Apr 2014 18:17:30 +0000 (14:17 -0400)]
Fix Knife bug T39617: midpoint snap should affect intermediate points.

This reverts to the 2.69 behavior, where the snap-to-midpoint option
affected the intermediate crossed edges as well as the endpoints.

5 years agoFix T39756: Extrude, immediate scale
Campbell Barton [Wed, 16 Apr 2014 18:02:42 +0000 (04:02 +1000)]
Fix T39756: Extrude, immediate scale

While not exactly a bug, switching to scale isnt generally useful to keep normal constraint.

5 years agoCode cleanup: use bools & const args
Campbell Barton [Wed, 16 Apr 2014 16:53:11 +0000 (02:53 +1000)]
Code cleanup: use bools & const args

5 years agoFix T39750: Bones disappearing with strange transforms.
Bastien Montagne [Wed, 16 Apr 2014 16:20:27 +0000 (18:20 +0200)]
Fix T39750: Bones disappearing with strange transforms.

Fixed this issue and another similar one, and some minor optimizations.

5 years agoFix related to new split normals draw code.
Bastien Montagne [Wed, 16 Apr 2014 14:51:49 +0000 (16:51 +0200)]
Fix related to new split normals draw code.

Tessellated split normals CDlayer had no swap func, hence ugly little test_index_face()
could not rotate its values correctly when rotating tessellated faces...

Extra-reported in T39735.

5 years agoFix cycles standalone file saving not taking number of samples into account properly.
Brecht Van Lommel [Wed, 16 Apr 2014 11:49:39 +0000 (13:49 +0200)]
Fix cycles standalone file saving not taking number of samples into account properly.

5 years agoAdd Edge sharp/smooth to 3DView shading panel, as well as new Vert sharp/smooth.
Bastien Montagne [Wed, 16 Apr 2014 13:18:14 +0000 (15:18 +0200)]
Add Edge sharp/smooth to 3DView shading panel, as well as new Vert sharp/smooth.

5 years agoFix for half pixel offset rasterizing masks
Campbell Barton [Wed, 16 Apr 2014 13:25:10 +0000 (23:25 +1000)]
Fix for half pixel offset rasterizing masks

5 years agoMath Lib: optimize axis_dominant_v3_to_m3, approx 6x speedup
Campbell Barton [Wed, 16 Apr 2014 11:04:17 +0000 (21:04 +1000)]
Math Lib: optimize axis_dominant_v3_to_m3, approx 6x speedup

build the matrix directly rather then calculating with axis/angle

also remove unused function calc_poly_plane

5 years agoMath Lib: increase epsilon for ortho_basis_v3v3_v3
Campbell Barton [Wed, 16 Apr 2014 07:24:27 +0000 (17:24 +1000)]
Math Lib: increase epsilon for ortho_basis_v3v3_v3

passing in a unit length vector wouldn't always compute unit length vectors because the epsilon tested was too small.