4 years agoMerge remote-tracking branch 'origin/master' into soc-2014-cycles soc-2014-cycles
Thomas Dinges [Tue, 5 Aug 2014 22:45:13 +0000 (00:45 +0200)]
Merge remote-tracking branch 'origin/master' into soc-2014-cycles

4 years agoCycles: Use bool for is_leaf bvh property.
Thomas Dinges [Tue, 5 Aug 2014 22:39:40 +0000 (00:39 +0200)]
Cycles: Use bool for is_leaf bvh property.

* This is not actually copied to the device, so we can use a bool here, which is smaller than a int.

4 years agoFix T41318: API change in OSL, I see no other cases but there might be
Martijn Berger [Tue, 5 Aug 2014 21:49:42 +0000 (23:49 +0200)]
Fix T41318: API change in OSL, I see no other cases but there might be

4 years agoRemove confusing word "faculative" from comments
Nicholas Bishop [Tue, 5 Aug 2014 20:05:24 +0000 (16:05 -0400)]
Remove confusing word "faculative" from comments

Reviewers: campbellbarton

Reviewed By: campbellbarton

Differential Revision:

4 years agoRemove SVN references
Campbell Barton [Tue, 5 Aug 2014 19:44:51 +0000 (05:44 +1000)]
Remove SVN references

4 years agoSpelling
Campbell Barton [Tue, 5 Aug 2014 19:39:41 +0000 (05:39 +1000)]

4 years agoCorrect change to dupli-drawing
Campbell Barton [Tue, 5 Aug 2014 18:56:18 +0000 (04:56 +1000)]
Correct change to dupli-drawing

Need exceptions so dupli-frames objects draw in render-only mode.

4 years agoOSX/cmake: move last commited line to a better place
Jens Verwiebe [Tue, 5 Aug 2014 18:21:22 +0000 (20:21 +0200)]
OSX/cmake: move last commited line to a better place

4 years agoOSX/cmake: force LLVM_STATIC ON, to fix linking issues
Jens Verwiebe [Tue, 5 Aug 2014 18:15:44 +0000 (20:15 +0200)]
OSX/cmake: force LLVM_STATIC ON, to fix linking issues

4 years agoFix T41062: "copy to selected" doens't work for all attributes.
Bastien Montagne [Tue, 5 Aug 2014 16:59:02 +0000 (18:59 +0200)]
Fix T41062: "copy to selected" doens't work for all attributes.

The issue was that some properties are no direct children of the struct we support in 'copy to selected'
(RNA_Sequence in this case). Since we can't use the ID of sequences here (it's the scene, while we need
a sequence level of control), we had to add a new API helper to RNA path, which takes a RNA type
and return a path relative to the closest ancester of that type.

This way, we get a path from the RNA_Sequence, and can easily apply it to all other valid sequences
to copy the property.

Review, suggestions and edits by Campbell Barton, thanks!

4 years agoAdd RNA access to packed libraries
Campbell Barton [Tue, 5 Aug 2014 17:10:53 +0000 (03:10 +1000)]
Add RNA access to packed libraries

4 years agoFix T41222 Blender gives weird output when baking (4096*4096) resolution on GPU
Dalai Felinto [Tue, 5 Aug 2014 16:50:50 +0000 (13:50 -0300)]
Fix T41222 Blender gives weird output when baking (4096*4096) resolution on GPU

In collaboration with Sergey Sharybin.

Also thanks to Wolfgang Faehnle (mib2berlin) for help testing the

Reviewers: sergey

Differential Revision:

4 years agoFix T41328: Saving a copy changes lib paths
Campbell Barton [Tue, 5 Aug 2014 16:48:37 +0000 (02:48 +1000)]
Fix T41328: Saving a copy changes lib paths

4 years agoAPI Docs: typos
Campbell Barton [Tue, 5 Aug 2014 16:09:26 +0000 (02:09 +1000)]
API Docs: typos

4 years agoReplace explicit object type check with already-existing macro
Nicholas Bishop [Tue, 5 Aug 2014 14:57:54 +0000 (10:57 -0400)]
Replace explicit object type check with already-existing macro

4 years agoAdd missing forward declaration and missing 'struct' keyword
Nicholas Bishop [Tue, 5 Aug 2014 14:47:59 +0000 (10:47 -0400)]
Add missing forward declaration and missing 'struct' keyword

4 years agoUI: remove tip when dragging a popup
Campbell Barton [Tue, 5 Aug 2014 14:40:41 +0000 (00:40 +1000)]
UI: remove tip when dragging a popup

4 years agoFix a few typos in carve-capi.h
Nicholas Bishop [Tue, 5 Aug 2014 14:36:45 +0000 (10:36 -0400)]
Fix a few typos in carve-capi.h

The typos didn't cause any bug, but the mis-ordered parameter names in CarveExporter_InitGeomArrays were confusing.

Reviewers: sergey

Reviewed By: sergey

Differential Revision:

4 years agoFix incorrect comments in listbase, add unit test to verify change
Nicholas Bishop [Tue, 5 Aug 2014 14:33:24 +0000 (10:33 -0400)]
Fix incorrect comments in listbase, add unit test to verify change

Reviewers: campbellbarton

Reviewed By: campbellbarton

Differential Revision:

4 years agoCorrect another issue in recent menu handling
Campbell Barton [Tue, 5 Aug 2014 14:05:20 +0000 (00:05 +1000)]
Correct another issue in recent menu handling

mouse clicks to exit a menu were ignored for non-floating popups

4 years agoFix to commit rB77b7e1fe9ab: need ${target} instead of blender in cmake macro.
Howard Trickey [Tue, 5 Aug 2014 11:52:34 +0000 (07:52 -0400)]
Fix to commit rB77b7e1fe9ab: need ${target} instead of blender in cmake macro.

4 years agoFix T41276: OSL bug in getmessage ("trace", "geom:name" , output)
Sergey Sharybin [Tue, 5 Aug 2014 11:53:00 +0000 (17:53 +0600)]
Fix T41276: OSL bug in getmessage ("trace", "geom:name" , output)

4 years agoFix possible harmful warning: the value of the size argument in 'strncat' is too...
Jens Verwiebe [Tue, 5 Aug 2014 10:03:31 +0000 (12:03 +0200)]
Fix possible harmful warning: the value of the size argument in 'strncat' is too large, change the argument to be the free space in the destination buffer minus the terminating null byte

4 years agoFix T41318: OSL broken on Linux kubuntu 14.04
Sergey Sharybin [Tue, 5 Aug 2014 09:53:00 +0000 (15:53 +0600)]
Fix T41318: OSL broken on Linux kubuntu 14.04

Now for real, hopefully.

4 years agoFix wrong assert happening in the CUEW
Sergey Sharybin [Tue, 5 Aug 2014 09:28:32 +0000 (15:28 +0600)]
Fix wrong assert happening in the CUEW

4 years agoFix: T41318
Martijn Berger [Tue, 5 Aug 2014 09:11:52 +0000 (11:11 +0200)]
Fix: T41318
OSL compiler signature changed with 1.5.

4 years agoDeduplicate CUDA and OpenCL wranglers
Sergey Sharybin [Tue, 5 Aug 2014 07:57:50 +0000 (13:57 +0600)]
Deduplicate CUDA and OpenCL wranglers

For now it was mainly about OpenCL wrangler being duplicated
between Cycles and Compositor, but with OpenSubdiv work those
wranglers were gonna to be duplicated just once again.

This commit makes it so Cycles and Compositor uses wranglers
from this repositories:


This repositories are based on the wranglers we used before
and they'll be likely continued maintaining by us plus some
more players in the market.

Pretty much straightforward change with some tricks in the
CMake/SCons to make this libs being passed to the linker
after all other libraries in order to make OpenSubdiv linked
against those wranglers in the future.

For those who're worrying about Cycles being less standalone,
it's not truth, it's rather more flexible now and in the future
different wranglers might be used in Cycles. For now it'll
just mean those libs would need to be put into Cycles repository
together with some other libs from Blender such as mikkspace.

This is mainly platform maintenance commit, should not be any
changes to the user space.

Reviewers: juicyfruit, dingto, campbellbarton

Reviewed By: juicyfruit, dingto, campbellbarton

Differential Revision:

4 years agoCleanup: indentation
Campbell Barton [Tue, 5 Aug 2014 03:36:35 +0000 (13:36 +1000)]
Cleanup: indentation

4 years agoFix for double freeing of MEM_guardedalloc'ed memory originating from BLF_lang_set().
Tamito Kajiyama [Tue, 5 Aug 2014 02:21:02 +0000 (11:21 +0900)]
Fix for double freeing of MEM_guardedalloc'ed memory originating from BLF_lang_set().

4 years agoCycles: Optimize Equi-Angular sampling using binary range search.
Thomas Dinges [Mon, 4 Aug 2014 23:32:35 +0000 (01:32 +0200)]
Cycles: Optimize Equi-Angular sampling using binary range search.

Patch by Lukas Tönne and myself.

4 years agoMacros: replace UNPACK#OP -> UNPACK#_EX, allow suffix
Campbell Barton [Mon, 4 Aug 2014 22:04:57 +0000 (08:04 +1000)]
Macros: replace UNPACK#OP -> UNPACK#_EX, allow suffix

4 years agoFix memory leak of main lock when reading from library files.
Antony Riakiotakis [Mon, 4 Aug 2014 14:00:57 +0000 (16:00 +0200)]
Fix memory leak of main lock when reading from library files.

4 years agoFix T41175: Quad View - Properties Region - Clip Tickable option bug?
Bastien Montagne [Mon, 4 Aug 2014 12:27:18 +0000 (14:27 +0200)]
Fix T41175: Quad View - Properties Region - Clip Tickable option bug?

4 years agoTweaks to macros
Campbell Barton [Mon, 4 Aug 2014 01:43:10 +0000 (11:43 +1000)]
Tweaks to macros

4 years agoMacros: prevent instantiation of args for type checks
Campbell Barton [Mon, 4 Aug 2014 01:14:20 +0000 (11:14 +1000)]
Macros: prevent instantiation of args for type checks

also make CHECK_TYPE_INLINE more strict

4 years agoCleanup: replace int cast with floorf when comparing time
Campbell Barton [Mon, 4 Aug 2014 00:22:45 +0000 (10:22 +1000)]
Cleanup: replace int cast with floorf when comparing time

4 years agoCorrect cu->pathlen treated as a float
Campbell Barton [Mon, 4 Aug 2014 00:15:25 +0000 (10:15 +1000)]
Correct cu->pathlen treated as a float

4 years agoCorrect glitch in recent menu commit, click-drag locked menus
Campbell Barton [Sun, 3 Aug 2014 19:36:55 +0000 (05:36 +1000)]
Correct glitch in recent menu commit, click-drag locked menus

4 years agoFix T41284: The python ops log doesn't work.
Bastien Montagne [Sun, 3 Aug 2014 19:17:24 +0000 (21:17 +0200)]
Fix T41284: The python ops log doesn't work.

4 years agoFixed linking OIIO on Windows. The debug and optimized options need to be before...
Jason Wilkins [Sun, 3 Aug 2014 16:35:39 +0000 (11:35 -0500)]
Fixed linking OIIO on Windows.  The debug and optimized options need to be before each individual library in a list.

4 years agoOSX/buildsystem: prepare usage on OSX 10.10 - Yosemite
Jens Verwiebe [Sun, 3 Aug 2014 10:51:26 +0000 (12:51 +0200)]
OSX/buildsystem: prepare usage on OSX 10.10 - Yosemite
- important: requires cmake >= 2.8.12 to read minor version right,
aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh )

4 years agoFix for glitch with menus not reliably setting an active item (D674)
Campbell Barton [Sun, 3 Aug 2014 10:30:12 +0000 (20:30 +1000)]
Fix for glitch with menus not reliably setting an active item (D674)

When menus are clamped to the window bounds,
its was possible not to have an active menu-item under the mouse,
Making Ctrl+S,Enter not completely reliable.

Changes needed to support this are:

- menu item is activated on popup menus
  (to avoid relying on mouse-over)
- moving mouse away from menu items only de-activates when over a new menu-item.
- Mouse clicks are ignored if they are not directly over the menu item.

4 years agofix check for not llvm
Martijn Berger [Sat, 2 Aug 2014 13:30:28 +0000 (15:30 +0200)]
fix check for not llvm

4 years agoCollada and llvm both use the same functions and they clash.
Martijn Berger [Sat, 2 Aug 2014 13:20:03 +0000 (15:20 +0200)]
Collada and llvm both use the same functions and they clash.
Since we have older llvm for msvc2008 and new one for msvc2013 we need to work around it.

4 years agoCycles: Avoid some NULL checks and conditions in volume sampling code.
Thomas Dinges [Sat, 2 Aug 2014 13:04:00 +0000 (15:04 +0200)]
Cycles: Avoid some NULL checks and conditions in volume sampling code.

* Avoid segment NULL check in kernel_branched_path_volume_connect_light(), we access it before the function call already.
* Avoid SD_SCATTER flag check in kernel_volume_decoupled_scatter(), we check for this before already.

4 years agoMerge remote-tracking branch 'origin/master' into soc-2014-cycles
Thomas Dinges [Sat, 2 Aug 2014 12:39:54 +0000 (14:39 +0200)]
Merge remote-tracking branch 'origin/master' into soc-2014-cycles

4 years agoCleanup: Don't check ls.pdf here, we already check for it in direct_emission().
Thomas Dinges [Sat, 2 Aug 2014 12:38:45 +0000 (14:38 +0200)]
Cleanup: Don't check ls.pdf here, we already check for it in direct_emission().

4 years agoCMake: add header
Campbell Barton [Sat, 2 Aug 2014 09:16:00 +0000 (19:16 +1000)]
CMake: add header

4 years agoMake CHECK_TYPE_NONCONST macro portable
Campbell Barton [Sat, 2 Aug 2014 08:03:50 +0000 (18:03 +1000)]
Make CHECK_TYPE_NONCONST macro portable

also replace __typeof -> typeof

4 years agoBMesh: typecheck iterator
Campbell Barton [Sat, 2 Aug 2014 08:03:07 +0000 (18:03 +1000)]
BMesh: typecheck iterator

4 years agoMove to OIIO 1.4 also for windows x86
Martijn Berger [Sat, 2 Aug 2014 07:59:09 +0000 (09:59 +0200)]
Move to OIIO 1.4 also for windows x86

4 years agoSpelling
Campbell Barton [Sat, 2 Aug 2014 06:53:52 +0000 (16:53 +1000)]

4 years agoCMake: tweak so 2.8.7 and older still work (disable WITH_BUILDINFO)
Campbell Barton [Fri, 1 Aug 2014 17:07:41 +0000 (03:07 +1000)]
CMake: tweak so 2.8.7 and older still work (disable WITH_BUILDINFO)

4 years agoCleanup: Move SpaceTransform helpers from `BKE_shrinkwrap` to `BLI_math_matrix`.
Bastien Montagne [Fri, 1 Aug 2014 14:28:31 +0000 (16:28 +0200)]
Cleanup: Move SpaceTransform helpers from `BKE_shrinkwrap` to `BLI_math_matrix`.

4 years agoCleanup: Move `object_get_derived_final` from BKE_shrinkwrap to BKE_DerivedMesh
Bastien Montagne [Fri, 1 Aug 2014 13:42:17 +0000 (15:42 +0200)]
Cleanup: Move `object_get_derived_final` from BKE_shrinkwrap to BKE_DerivedMesh

Note this func needs some love, but this will be for later (should never have been in shrinkwrap code!).

4 years agoCycles: Update stdosl.h for OSL 1.5.
Thomas Dinges [Fri, 1 Aug 2014 13:23:28 +0000 (15:23 +0200)]
Cycles: Update stdosl.h for OSL 1.5.

4 years agoCmake prefers NOT to !
Martijn Berger [Fri, 1 Aug 2014 13:18:34 +0000 (15:18 +0200)]
Cmake prefers NOT to !

4 years agoMake function definition consistent with function declaration (as discussed with...
gaiaclary [Fri, 1 Aug 2014 12:31:41 +0000 (14:31 +0200)]
Make function definition consistent with function declaration (as discussed with campbell)

4 years agoFix msvc 2013 / win64 to use new OIIO and llvm and resulting linking
Martijn Berger [Fri, 1 Aug 2014 12:28:00 +0000 (14:28 +0200)]
Fix msvc 2013 / win64 to use new OIIO and llvm and resulting linking

4 years agoPrevent macros hiding casts from `const` pointers
Campbell Barton [Fri, 1 Aug 2014 11:59:42 +0000 (21:59 +1000)]
Prevent macros hiding casts from `const` pointers

4 years agoMake build work with llvm3.4 and oiio 1.4
Martijn Berger [Fri, 1 Aug 2014 11:43:12 +0000 (13:43 +0200)]
Make build work with llvm3.4 and oiio 1.4

4 years agoFix T41197: Blender freezes to infinite loop when switching to PAUSED Cycles rendered...
Sergey Sharybin [Fri, 1 Aug 2014 10:39:05 +0000 (16:39 +0600)]
Fix T41197: Blender freezes to infinite loop when switching to PAUSED Cycles rendered viewport

4 years agoRevert "Fix T41226: Wrong Undo on curves and hooks"
Sergey Sharybin [Fri, 1 Aug 2014 04:56:20 +0000 (10:56 +0600)]
Revert "Fix T41226: Wrong Undo on curves and hooks"

This reverts commit e042c8428f8c0c0a72cdd23d2c058c20ab5745ed.

Proper fix will come later, or be declared a TODO.

4 years agoOSX/cmake: adapt bundle structure according scons
Jens Verwiebe [Thu, 31 Jul 2014 23:23:23 +0000 (01:23 +0200)]
OSX/cmake: adapt bundle structure according scons

4 years agoBake-API: cleanup - missing (size_t) promotion
Dalai Felinto [Thu, 31 Jul 2014 23:08:05 +0000 (20:08 -0300)]
Bake-API: cleanup - missing (size_t) promotion

4 years agoOSX: updated codesigning README and removed not longer valid rule plists
Jens Verwiebe [Thu, 31 Jul 2014 23:01:12 +0000 (01:01 +0200)]
OSX: updated codesigning README and removed not longer valid rule plists

4 years agoOSX/scons: Change Blender bundle datastructures + referennces to match the upcoming...
Jens Verwiebe [Thu, 31 Jul 2014 22:57:17 +0000 (00:57 +0200)]
OSX/scons: Change Blender bundle datastructures + referennces to match the upcoming codesigning needs
- i used deprecated rules up to now which will break in OSX > 10.9.5 and 10.10 > dp4
- todo: adapt cmake due it will break with this commit

4 years agoTweak for yesterdays volume shadow optimization.
Thomas Dinges [Thu, 31 Jul 2014 22:26:03 +0000 (00:26 +0200)]
Tweak for yesterdays volume shadow optimization.

* Avoid division and branching, suggested by Sergey.

4 years agoFix T41236: Rendered viewport doesn't update with material actions
Sergey Sharybin [Thu, 31 Jul 2014 16:01:56 +0000 (22:01 +0600)]
Fix T41236: Rendered viewport doesn't update with material actions

The issue was caused by NLA evaluation without actions not setting
id's flag as updated (as that's happening when action writes data
to the ID datablock).

Added the same flag set for the NLA evaluation as what's happening
for actions.

4 years agoStyle cleanup
Campbell Barton [Thu, 31 Jul 2014 16:03:09 +0000 (02:03 +1000)]
Style cleanup

4 years agoFix build player...
Bastien Montagne [Thu, 31 Jul 2014 15:34:13 +0000 (17:34 +0200)]
Fix build player...

4 years agoFix T40958 align rotation + project individual elements not working
Antony Riakiotakis [Thu, 31 Jul 2014 15:02:03 +0000 (17:02 +0200)]
Fix T40958 align rotation + project individual elements not working

This is another example of transform code crappiness. Projection
snapping for objects is handled separately than regular snapping.
Luckilly for us, we have the normal ready from the raycast result and a
copy of code from ElementRotation function can do the necessary
rotations for us.

I have not enforced constraints here (arguably, maybe I should, and the
already present projection snapping should do that too but seems it is
commented out and the unorthodox order of operations here has me a bit
scared. Leaving as TODO)

4 years agoUse dynamically linked SDL 1.2.15 on windows x64
Martijn Berger [Thu, 31 Jul 2014 14:43:02 +0000 (16:43 +0200)]
Use dynamically linked SDL 1.2.15 on windows x64

4 years agoFix T41258: Crash when entering edit mode while viewport render is enabled
Sergey Sharybin [Thu, 31 Jul 2014 14:18:51 +0000 (20:18 +0600)]
Fix T41258: Crash when entering edit mode while viewport render is enabled

The issue was caused by the render engine loading edit mesh, which re-allocates
mesh array which might be referenced by other object's derived meshed.

Worst thing about this is that updating render engine happens from the end of
scene update function, after all the objects are updated and so. This is needed
so render engine gets the update objects which is correct.

The only proper way to solve the issue is to make it so viewport engine does not
leave objects in inconsistent state, meaning nobody will reference to freed data.

In order to reach this we do edit mesh loading before running objects update so
all the objects which uses that mesh will have proper references in the derived

This also solves old creepyness which happened before when having single object
in edit mode. tweaking it will calculate derived mesh as a part of scene update,
then this derived mesh will be freed by edit mesh loading and viewport will be
creating derived mesh again.

Now render engine is expected to do nothing with meshes which are in edit mode,
but they still need to load edit data for non0meshes. It's not really easy to
do from the BKE level because needed functions are implemented in the editor.

Thanks Campbell for the review!

Differential Revision:

4 years agoPartial fix of T40824,
Antony Riakiotakis [Thu, 31 Jul 2014 12:24:26 +0000 (14:24 +0200)]
Partial fix of T40824,

Fill selection for file browser moves to ctrl-shift click due to
collision with emulate middle mouse button option

4 years agoFix T41226: Wrong Undo on curves and hooks
Sergey Sharybin [Thu, 31 Jul 2014 12:21:30 +0000 (18:21 +0600)]
Fix T41226: Wrong Undo on curves and hooks

4 years agoFix T41140
Antony Riakiotakis [Thu, 31 Jul 2014 10:15:38 +0000 (12:15 +0200)]
Fix T41140

Yet another attempt to fix the annoying lines that crop up in texture
painting on edges and quads. I feel this needs better investigation but
using pixel tolerance here looks like alleviates the issue.

4 years agoFix T41257.
Antony Riakiotakis [Thu, 31 Jul 2014 09:46:19 +0000 (11:46 +0200)]
Fix T41257.

We need to allow faces without slots to initialize a UV layer or seam
checking code will go bananas.

4 years agoCycles Bake: use size_t instead of width, height
Dalai Felinto [Mon, 28 Jul 2014 17:29:03 +0000 (14:29 -0300)]
Cycles Bake: use size_t instead of width, height

(original patch by Sergey Sharybin)

Note: RNA API can't use size_t at the moment. Once it does this patch
can be tweaked a bit to fully benefit from size_t larger dimensions.
(right now num_pixels is passed as int)

Reviewed By: sergey, campbellbarton
Differential Revision:

4 years agoBake-API: use size_t instead of width, height
Dalai Felinto [Mon, 28 Jul 2014 17:29:03 +0000 (14:29 -0300)]
Bake-API: use size_t instead of width, height

(original patch by Sergey Sharybin)

Note: RNA API can't use size_t at the moment. Once it does this patch
can be tweaked a bit to fully benefit from size_t larger dimensions.
(right now num_pixels is passed as int)

Reviewed By: sergey, campbellbarton
Differential Revision:

4 years agoDefault LLVM_STATIC to OFF (it's kinda broken currently, gives various linking issues).
Bastien Montagne [Wed, 30 Jul 2014 18:31:13 +0000 (20:31 +0200)]
Default LLVM_STATIC to OFF (it's kinda broken currently, gives various linking issues).

4 years agoCycles: Optimization for Heterogeneous Volume Shadows.
Thomas Dinges [Wed, 30 Jul 2014 17:59:15 +0000 (19:59 +0200)]
Cycles: Optimization for Heterogeneous Volume Shadows.

* Don't compute expf() for every step, instead sum the intermediate values and calculate it every N (8 for now) steps.

This helps a few percent (~5% on a cube with wave texture) in my tests here.

4 years agouser lower threshold for Harris feature detector
Sebastian Koenig [Wed, 30 Jul 2014 16:27:41 +0000 (22:27 +0600)]
user lower threshold for Harris feature detector

4 years agoBLI_path_utils: rename BLI_clean -> BLI_path_native_slash
Campbell Barton [Wed, 30 Jul 2014 15:40:05 +0000 (01:40 +1000)]
BLI_path_utils: rename BLI_clean -> BLI_path_native_slash

4 years agoFix T41241: VSE: cropping strips puts a transparent line through the image.
Bastien Montagne [Wed, 30 Jul 2014 15:28:48 +0000 (17:28 +0200)]
Fix T41241: VSE: cropping strips puts a transparent line through the image.

4 years agoCode cleanup, make pie-menus code be closer to master
Antony Riakiotakis [Wed, 30 Jul 2014 13:50:37 +0000 (15:50 +0200)]
Code cleanup, make pie-menus code be closer to master

4 years agoFix addon crash when trying listdir a directory we have no permission to.
Bastien Montagne [Wed, 30 Jul 2014 13:35:19 +0000 (15:35 +0200)]
Fix addon crash when trying listdir a directory we have no permission to.

4 years agoMerge remote-tracking branch 'origin/master' into soc-2014-cycles
Thomas Dinges [Wed, 30 Jul 2014 13:31:08 +0000 (15:31 +0200)]
Merge remote-tracking branch 'origin/master' into soc-2014-cycles

4 years agoCleanup: general cleanup in BLI_math code (mostly, use 'const' where possible, true...
Bastien Montagne [Wed, 30 Jul 2014 09:00:59 +0000 (11:00 +0200)]
Cleanup: general cleanup in BLI_math code (mostly, use 'const' where possible, true/false for booleans, format for float litterals).

4 years agoleanup: style, use 'const' where possible, and simplified blend funcs.
Bastien Montagne [Wed, 30 Jul 2014 08:42:25 +0000 (10:42 +0200)]
leanup: style, use 'const' where possible, and simplified blend funcs.

Much better to use small loops when doing complex operations over color elements
(any serious compiler will flatten them anyway), avoids (some!) stupid mistakes when
editing their code.

Also, use min/max funcs instead of lengthier 'if (foo < 0) foo = 0'.

4 years agoAutomatic commit by arc
gaiaclary [Wed, 30 Jul 2014 10:00:11 +0000 (12:00 +0200)]
Automatic commit by arc

4 years agoBMesh: callback for bmbvh so caller can choose faces
Campbell Barton [Wed, 30 Jul 2014 06:48:20 +0000 (16:48 +1000)]
BMesh: callback for bmbvh so caller can choose faces

4 years agoBugfix T41240: Home key doesn't show everything on F-Curves
Joshua Leung [Wed, 30 Jul 2014 06:15:49 +0000 (18:15 +1200)]
Bugfix T41240: Home key doesn't show everything on F-Curves

Own copy and paste typo in 73d157e meant that this was not in some cases,
the bounds calculated may be incorrect.

4 years agomissed last commit
Campbell Barton [Wed, 30 Jul 2014 05:02:42 +0000 (15:02 +1000)]
missed last commit

4 years agoBLI_listbase: consistent name prefix
Campbell Barton [Wed, 30 Jul 2014 05:01:16 +0000 (15:01 +1000)]
BLI_listbase: consistent name prefix

4 years agoGHash: generic comparison for int[4]
Campbell Barton [Tue, 29 Jul 2014 21:30:18 +0000 (07:30 +1000)]
GHash: generic comparison for int[4]

4 years agoOSX/buildbot: after recent scons fix, UTF lib linkage is handled dependent on config...
Jens Verwiebe [Tue, 29 Jul 2014 18:08:41 +0000 (20:08 +0200)]
OSX/buildbot: after recent scons fix,  UTF lib linkage is handled dependent on config, so remove now obsolete lines

4 years agoOSX/cmake: fix linking utf-functions if llvm is disabled
Jens Verwiebe [Tue, 29 Jul 2014 17:46:05 +0000 (19:46 +0200)]
OSX/cmake: fix linking utf-functions if llvm is disabled

4 years agoCycles: Further optimizations for Volume Light Sampling.
Thomas Dinges [Tue, 29 Jul 2014 15:58:14 +0000 (17:58 +0200)]
Cycles: Further optimizations for Volume Light Sampling.

* Now we calculate ls->P only, which is needed for equi-angular sampling. If the scattering is successful, we call the regular light_sample() functions.

4 years agoFix T41223: F-Curve sliders won't update values during playback when mouse cursor...
Bastien Montagne [Tue, 29 Jul 2014 13:31:53 +0000 (15:31 +0200)]
Fix T41223: F-Curve sliders won't update values during playback when mouse cursor is outside the left panel.