blender.git
3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 11 Dec 2017 08:24:37 +0000 (19:24 +1100)]
Merge branch 'master' into blender2.8

3 years agoDNA/RNA: add 'py_instance' for ID types
Campbell Barton [Mon, 11 Dec 2017 07:37:54 +0000 (18:37 +1100)]
DNA/RNA: add 'py_instance' for ID types

Avoid creating new Python instances
every time a scene, object, mesh .. etc are accessed.

Also resolves crashes T28724, T53530
although it's only valid for ID types, not modifiers vertices etc.

Back-ported from blender2.8 branch.

3 years agoFix grab3d manipulator in a 2D group
Campbell Barton [Mon, 11 Dec 2017 06:07:40 +0000 (17:07 +1100)]
Fix grab3d manipulator in a 2D group

Was taking scale into account twice.

3 years agoPyAPI: Correct manipulator template
Campbell Barton [Mon, 11 Dec 2017 05:01:07 +0000 (16:01 +1100)]
PyAPI: Correct manipulator template

3 years agoWM: update splash size for templates
Campbell Barton [Mon, 11 Dec 2017 01:53:28 +0000 (12:53 +1100)]
WM: update splash size for templates

3 years agoMSVC: Fix compiling with some system languages
Campbell Barton [Sun, 10 Dec 2017 04:12:31 +0000 (15:12 +1100)]
MSVC: Fix compiling with some system languages

Report from @cyaoeu that compiling failed for Japanese system language.

4 years agoWorkspace: Clarifying library remap workaround
Dalai Felinto [Fri, 8 Dec 2017 15:27:22 +0000 (13:27 -0200)]
Workspace: Clarifying library remap workaround

WorkSpaceLayout->screen will be made public soon, but meanwhile this makes it
clear why we are not passing layout->screen to CALLBACK_INVOKE in this case.

4 years agoLibrary remap: Fix issue remapping pointer of object coming from group[s base
Sergey Sharybin [Fri, 8 Dec 2017 15:06:32 +0000 (16:06 +0100)]
Library remap: Fix issue remapping pointer of object coming from group[s base

We can not store pointer to an object ion temporary variable here, since then
pointer will not be updated in the base itself.

This fixes missing modifiers on objects coming from dupli-group.

4 years agoCleanup, indentation
Sergey Sharybin [Fri, 8 Dec 2017 15:03:56 +0000 (16:03 +0100)]
Cleanup, indentation

4 years agoDepsgraph: Groups are now covered by dependency graph
Sergey Sharybin [Fri, 8 Dec 2017 14:54:10 +0000 (15:54 +0100)]
Depsgraph: Groups are now covered by dependency graph

4 years agoDepsgraph: We need to add ID node before getting CoW pointer
Sergey Sharybin [Fri, 8 Dec 2017 14:43:26 +0000 (15:43 +0100)]
Depsgraph: We need to add ID node before getting CoW pointer

Need to split runtime get-cow-pointer with a builder one, and add some asserts
to catch mis-use.

4 years agoMerge branch 'master' into blender2.8
Germano [Fri, 8 Dec 2017 14:43:52 +0000 (12:43 -0200)]
Merge branch 'master' into blender2.8

4 years agoFix T53512: Vertices with index 0 were not being selected
Germano [Fri, 8 Dec 2017 14:42:00 +0000 (12:42 -0200)]
Fix T53512: Vertices with index 0 were not being selected

Bug introduced on rB9f5bf197a0c3.
The offset for selection of vertices (`bm_vertoffs`) starts where the offset o edges ends (`bm_wireoffs`).
However, the `bm_wireoffs` depends on the offset of face selection (`bm_solidoffs`).

Before the commit that introduced the bug, the drawn of edges (in backbuff) was always computed along with the `bm_wireoffs`:
```
bm_wireoffs = bm_solidoffs + em->bm->totedge;
```

Now that the edges are not always drawn in backbuff, `bm_wireoffs` has to start from `bm_solidoffs`.

4 years agoCleanup, indentation
Sergey Sharybin [Fri, 8 Dec 2017 13:47:48 +0000 (14:47 +0100)]
Cleanup, indentation

4 years agoDepsgraph: Use dedicated function for group evaluation
Sergey Sharybin [Fri, 8 Dec 2017 13:45:15 +0000 (14:45 +0100)]
Depsgraph: Use dedicated function for group evaluation

It is still based on generic collection evaluation, but the idea is to avoid
having view_layer pointer passed from group to it's evaluation function.

This is essential for copy-on-write, where we need to pass view_layer pointer
from a copied datablock, but that copy is not yet available at construction
time. Also, this is NOT the case where we want to expand datablock at a
construction time, just to keep our life easier.

4 years agoFix group duplication bug
Dalai Felinto [Fri, 8 Dec 2017 14:00:46 +0000 (12:00 -0200)]
Fix group duplication bug

View Layer was not duplicated between destination and source.

This would lead to a crash if you duplicated the group and assigned
the new group to any object.

4 years agoCode cleanup
Dalai Felinto [Fri, 8 Dec 2017 14:00:00 +0000 (12:00 -0200)]
Code cleanup

Thanks for Sergey Sharybin for spotting this.

4 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Fri, 8 Dec 2017 13:54:59 +0000 (14:54 +0100)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/interface/interface_templates.c

4 years agoCleanup: moar busting of nasty C++ keywords-as-varnames.
Bastien Montagne [Fri, 8 Dec 2017 13:50:45 +0000 (14:50 +0100)]
Cleanup: moar busting of nasty C++ keywords-as-varnames.

4 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Fri, 8 Dec 2017 13:39:17 +0000 (14:39 +0100)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/interface/interface_templates.c

4 years agoCleanup: avoid using C++ keywords as variables, even in pure C code.
Bastien Montagne [Fri, 8 Dec 2017 13:36:07 +0000 (14:36 +0100)]
Cleanup: avoid using C++ keywords as variables, even in pure C code.

This tends to make some IDE unhappy (like QTCreator)...

4 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Fri, 8 Dec 2017 11:44:32 +0000 (12:44 +0100)]
Merge branch 'master' into blender2.8

4 years agoCycles: Fix difference in image Clip extension method between CPU and GPU
Sergey Sharybin [Fri, 8 Dec 2017 10:20:12 +0000 (11:20 +0100)]
Cycles: Fix difference in image Clip extension method between CPU and GPU

Our own implementation was behaving different comparing to OSL and GPU,
namely on the border pixels OSL and CUDA was doing interpolation with
black, but we were clamping coordinate.

This partially fixes issue reported in T53452.

Similar change should also be done for 3D interpolation perhaps, but this
is to be investigated separately.

4 years agoEevee: Fix default shader SSR id.
Clément Foucault [Fri, 8 Dec 2017 10:57:51 +0000 (11:57 +0100)]
Eevee: Fix default shader SSR id.

4 years agoEevee: Fix SSR ans SSAO for intel GPU.
Clément Foucault [Fri, 8 Dec 2017 10:56:48 +0000 (11:56 +0100)]
Eevee: Fix SSR ans SSAO for intel GPU.

On my intel GPU there is some issue when rendering to depth only format.
This workaround the issue.

4 years agoEevee: Remove unecessary defines.
Clément Foucault [Fri, 8 Dec 2017 10:54:15 +0000 (11:54 +0100)]
Eevee:  Remove unecessary defines.

4 years agoCycles: Cleanup, split 2D interpolation function
Sergey Sharybin [Thu, 7 Dec 2017 16:45:37 +0000 (17:45 +0100)]
Cycles: Cleanup, split 2D interpolation function

4 years agoMerge branch 'master' into blender2.8
Campbell Barton [Fri, 8 Dec 2017 01:59:51 +0000 (12:59 +1100)]
Merge branch 'master' into blender2.8

4 years agobl_app_override: support empty UI layout items
Campbell Barton [Fri, 8 Dec 2017 01:48:12 +0000 (12:48 +1100)]
bl_app_override: support empty UI layout items

Returning None from ui_ignore functions creates empty labels,
allows removing items without breaking layout in some cases.

4 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Dalai Felinto [Thu, 7 Dec 2017 17:00:03 +0000 (15:00 -0200)]
Merge remote-tracking branch 'origin/master' into blender2.8

4 years agoFix Collada building
Dalai Felinto [Thu, 7 Dec 2017 13:44:05 +0000 (11:44 -0200)]
Fix Collada building

Bug introduced in cc811d1fd634.

4 years agoFix T53419: Masking "Add" menu is not present in Image editor, but shortcut is
Sebastian Koenig [Thu, 7 Dec 2017 13:44:10 +0000 (14:44 +0100)]
Fix T53419: Masking "Add" menu is not present in Image editor, but shortcut is

4 years agoDPX/Cineon: Report orientation when running with --debug
Sergey Sharybin [Thu, 7 Dec 2017 13:37:59 +0000 (14:37 +0100)]
DPX/Cineon: Report orientation when running with --debug

4 years agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 7 Dec 2017 13:21:54 +0000 (00:21 +1100)]
Merge branch 'master' into blender2.8

4 years agoCMake: GREATER_EQUAL is from v3.7, use GREATER
Campbell Barton [Thu, 7 Dec 2017 13:19:35 +0000 (00:19 +1100)]
CMake: GREATER_EQUAL is from v3.7, use GREATER

4 years agoFix T53499: Cannot load DPX files
Sergey Sharybin [Thu, 7 Dec 2017 13:07:57 +0000 (14:07 +0100)]
Fix T53499: Cannot load DPX files

The issue was caused by unspecified color transfer. New behavior gives same
result as other viewers here, so likely is fine :)

4 years agoDPX: Fix wrong flag being checked for debug
Sergey Sharybin [Thu, 7 Dec 2017 13:04:12 +0000 (14:04 +0100)]
DPX: Fix wrong flag being checked for debug

4 years agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 7 Dec 2017 12:53:03 +0000 (23:53 +1100)]
Merge branch 'master' into blender2.8

4 years agoCleanup: Use BKE_colorband prefix
Campbell Barton [Thu, 7 Dec 2017 04:52:59 +0000 (15:52 +1100)]
Cleanup: Use BKE_colorband prefix

4 years agoCleanup: extract BKE_colorband from BKE_texture
Campbell Barton [Thu, 7 Dec 2017 04:36:26 +0000 (15:36 +1100)]
Cleanup: extract BKE_colorband from BKE_texture

4 years agoArray Modifier: option to offset UV's
Campbell Barton [Wed, 6 Dec 2017 17:33:52 +0000 (04:33 +1100)]
Array Modifier: option to offset UV's

D2912 by @Zuorion

4 years agoProposed fix for T53263 -- Blender crashes when rendering with Stabilizer 2D node...
Daniel Silva [Wed, 6 Dec 2017 13:53:21 +0000 (14:53 +0100)]
Proposed fix for T53263 -- Blender crashes when rendering with Stabilizer 2D node without movie selected

The program won't crash anymore, but a warning won't be displayed. Anyway, this gives the user the chance to save the project.

https://developer.blender.org/T53263

Reviewers: lukastoenne

Differential Revision: https://developer.blender.org/D2934

4 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 6 Dec 2017 13:06:49 +0000 (14:06 +0100)]
Merge branch 'master' into blender2.8

4 years agoLibrary: Add flag top keep ID library pointer around
Sergey Sharybin [Wed, 6 Dec 2017 11:59:00 +0000 (12:59 +0100)]
Library: Add flag top keep ID library pointer around

This only applies to ID being copied outside of bmain. Handy for cases when it
is important to check if the copy corresponds to a data block coming from
library.

Example of that is proxy evaluation with copy on write.

Thanks Bastien for review!

4 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 6 Dec 2017 11:27:44 +0000 (12:27 +0100)]
Merge branch 'master' into blender2.8

4 years agoDepsgraph: Cleanup, use less geenric data type
Sergey Sharybin [Wed, 6 Dec 2017 11:26:10 +0000 (12:26 +0100)]
Depsgraph: Cleanup, use less geenric data type

4 years agoDepsgraph: Proxy pose bones should be coming from CoW object
Sergey Sharybin [Wed, 6 Dec 2017 11:13:10 +0000 (12:13 +0100)]
Depsgraph: Proxy pose bones should be coming from CoW object

This should solve crash on files having proxies, but there will still be
assert failure because proxy_from is expected to come from library, which
is no longer truth for objects which got copied.

4 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 6 Dec 2017 10:58:13 +0000 (11:58 +0100)]
Merge branch 'master' into blender2.8

4 years agoDepsgraph: Forgot this in previous commit
Sergey Sharybin [Wed, 6 Dec 2017 10:57:57 +0000 (11:57 +0100)]
Depsgraph: Forgot this in previous commit

4 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 6 Dec 2017 10:55:30 +0000 (11:55 +0100)]
Merge branch 'master' into blender2.8

4 years agoDepsgraph: Ignore text datablocks from nodes
Sergey Sharybin [Wed, 6 Dec 2017 10:54:52 +0000 (11:54 +0100)]
Depsgraph: Ignore text datablocks from nodes

Those are not part of dependency graph, but still could be referenced from
the tree.

4 years agoDepsgraph: Owner ID must always be original ID
Sergey Sharybin [Wed, 6 Dec 2017 10:38:58 +0000 (11:38 +0100)]
Depsgraph: Owner ID must always be original ID

Missed that in the review.

4 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Wed, 6 Dec 2017 09:38:34 +0000 (10:38 +0100)]
Merge branch 'master' into blender2.8

4 years agoEevee: Fix sampling direction calculation.
Clément Foucault [Wed, 6 Dec 2017 09:45:12 +0000 (10:45 +0100)]
Eevee: Fix sampling direction calculation.

It was causing problems with the visibility filtering on Intel GPU.

4 years agoDepsgraph: Add missing bone properties to proxy rigs
Sergey Sharybin [Tue, 5 Dec 2017 16:34:11 +0000 (17:34 +0100)]
Depsgraph: Add missing bone properties to proxy rigs

4 years agoDepsgraph: Add missing NULL pointer check
Sergey Sharybin [Tue, 5 Dec 2017 16:14:17 +0000 (17:14 +0100)]
Depsgraph: Add missing NULL pointer check

4 years agoDepsgraph: Cleanup, remove unused function
Sergey Sharybin [Tue, 5 Dec 2017 15:51:21 +0000 (16:51 +0100)]
Depsgraph: Cleanup, remove unused function

4 years agoDepsgraph: Remove workaround of parameters animation in node tree
Sergey Sharybin [Tue, 5 Dec 2017 15:47:20 +0000 (16:47 +0100)]
Depsgraph: Remove workaround of parameters animation in node tree

4 years agoDepsgraph: Remove workaround of parameters animation in lamp
Sergey Sharybin [Tue, 5 Dec 2017 15:43:27 +0000 (16:43 +0100)]
Depsgraph: Remove workaround of parameters animation in lamp

4 years agoDepsgraph: Remove workaround of parameters animation in camera
Sergey Sharybin [Tue, 5 Dec 2017 15:35:58 +0000 (16:35 +0100)]
Depsgraph: Remove workaround of parameters animation in camera

This is something what should be done by build_animation().

4 years agoDepsgraph: Remove workaround for animated geometry component
Sergey Sharybin [Tue, 5 Dec 2017 15:21:28 +0000 (16:21 +0100)]
Depsgraph: Remove workaround for animated geometry component

4 years agoDepsgraph: Remove workaround for animated modifiers
Sergey Sharybin [Tue, 5 Dec 2017 15:19:00 +0000 (16:19 +0100)]
Depsgraph: Remove workaround for animated modifiers

4 years agoDepsgraph: Leave armature animation relation to build_animation()
Sergey Sharybin [Tue, 5 Dec 2017 15:09:03 +0000 (16:09 +0100)]
Depsgraph: Leave armature animation relation to build_animation()

Needs some optimization trick to hook pose init function to animation
instead of a bone. This is how flush will work anyway.

4 years agoDepsgraph: Use default argument value for relations builder
Sergey Sharybin [Tue, 5 Dec 2017 14:59:48 +0000 (15:59 +0100)]
Depsgraph: Use default argument value for relations builder

Follows other function definitions.

4 years agoDepsgraph: Cleanup, line wrapping
Sergey Sharybin [Tue, 5 Dec 2017 12:02:36 +0000 (13:02 +0100)]
Depsgraph: Cleanup, line wrapping

4 years agoDepsgraph: Use build_animation() to build relations to animated properties
Sergey Sharybin [Tue, 5 Dec 2017 11:57:01 +0000 (12:57 +0100)]
Depsgraph: Use build_animation() to build relations to animated properties

Before that it was up to lots of other places to keep track on whether
something is to be dependent on time or not. Was annoying, and unreliable,
and fragile.

This commit avoids hacks in object builder. Other areas will be adopted
soon.

4 years agoDepsgraph: Add ability to check whether relation exists before adding it
Sergey Sharybin [Tue, 5 Dec 2017 11:52:17 +0000 (12:52 +0100)]
Depsgraph: Add ability to check whether relation exists before adding it

Currently not used, but this is aimed to be used when adding relations from
FCurve to property which is being animated.

4 years agoDepsgraph: Cleanup, line wrapping
Sergey Sharybin [Tue, 5 Dec 2017 10:37:27 +0000 (11:37 +0100)]
Depsgraph: Cleanup, line wrapping

4 years agoDepsgraph: Move implementation part of relations header to own file
Sergey Sharybin [Tue, 5 Dec 2017 10:35:28 +0000 (11:35 +0100)]
Depsgraph: Move implementation part of relations header to own file

4 years agoFix T53408: Updating Cycles Nodes via Drivers in Material View
Sergey Sharybin [Tue, 5 Dec 2017 09:14:12 +0000 (10:14 +0100)]
Fix T53408: Updating Cycles Nodes via Drivers in Material View

This is something what should be supported by the new dependency graph.

Fixed by making it so, build_animation() adds relation between Animation
component and whatever-is-being-animated. In fact, for now, only relations to
ID properties are added. Rest of the relations are kind of hacked in all over
the code and needs to be removed and verified with specific .blend files.

4 years agoDepsgraph: Cleanup, split build_animation
Sergey Sharybin [Mon, 4 Dec 2017 17:34:27 +0000 (18:34 +0100)]
Depsgraph: Cleanup, split build_animation

4 years agoDepsgraph: Correct fallback for the parameters calculation
Sergey Sharybin [Mon, 4 Dec 2017 17:24:38 +0000 (18:24 +0100)]
Depsgraph: Correct fallback for the parameters calculation

We can't use a single component here, sine it might consist of multiple
operations. So, for example, having driver operation will confuse targets
of another driver.

4 years agoDepsgraph: Cleanup, split driver builder function
Sergey Sharybin [Mon, 4 Dec 2017 17:11:43 +0000 (18:11 +0100)]
Depsgraph: Cleanup, split driver builder function

4 years agoDepsgraph: Cleanup, deduplicate as much as possible in build_driver
Sergey Sharybin [Mon, 4 Dec 2017 17:08:29 +0000 (18:08 +0100)]
Depsgraph: Cleanup, deduplicate as much as possible in build_driver

4 years agoDepsgraph: Remove old comments which are likely outdated
Sergey Sharybin [Mon, 4 Dec 2017 17:06:52 +0000 (18:06 +0100)]
Depsgraph: Remove old comments which are likely outdated

4 years agoDepsgraph: Replace last obvious part of driver builder with generic RNA code
Sergey Sharybin [Mon, 4 Dec 2017 17:06:13 +0000 (18:06 +0100)]
Depsgraph: Replace last obvious part of driver builder with generic RNA code

4 years agoDepsgraph: Add criteria for RNA_Key
Sergey Sharybin [Mon, 4 Dec 2017 17:06:02 +0000 (18:06 +0100)]
Depsgraph: Add criteria for RNA_Key

4 years agoDepsgraph: Remove confusing ID node criteria
Sergey Sharybin [Mon, 4 Dec 2017 17:00:24 +0000 (18:00 +0100)]
Depsgraph: Remove confusing ID node criteria

it sometimes overrides all possible other criteria, even tho we might want to
be very specific about what component we are looking for here.

4 years agoDepsgraph: Use generic function for shape key driver target
Sergey Sharybin [Mon, 4 Dec 2017 16:39:58 +0000 (17:39 +0100)]
Depsgraph: Use generic function for shape key driver target

There was a second place for shape keys.

4 years agoDepsgraph: Fix wrong relations built for drivers
Sergey Sharybin [Mon, 4 Dec 2017 16:37:21 +0000 (17:37 +0100)]
Depsgraph: Fix wrong relations built for drivers

When target was changed from bone to regular object, new dependency graph was
still trying to build relations as if driver was using bone.

4 years agoDepsgraph: Use generic function for shape key driver target
Sergey Sharybin [Mon, 4 Dec 2017 13:08:53 +0000 (14:08 +0100)]
Depsgraph: Use generic function for shape key driver target

4 years agoDepsgraph: Use generic function for modifiers driver target
Sergey Sharybin [Mon, 4 Dec 2017 12:59:17 +0000 (13:59 +0100)]
Depsgraph: Use generic function for modifiers driver target

4 years agoDepsgraph: Use existing utility function to get driver target node
Sergey Sharybin [Mon, 4 Dec 2017 12:49:13 +0000 (13:49 +0100)]
Depsgraph: Use existing utility function to get driver target node

Only done for pose bone for now, but the idea is to go case bu case in
build_driver and move all custom logic from there to find_node_from_pointer().

4 years agoDepsgraph: Cleanup, split build_driver function up
Sergey Sharybin [Mon, 4 Dec 2017 16:01:02 +0000 (17:01 +0100)]
Depsgraph: Cleanup, split build_driver function up

4 years agoDepsgraph: Don't see reason to have special case for bone's RNA path
Sergey Sharybin [Mon, 4 Dec 2017 15:58:02 +0000 (16:58 +0100)]
Depsgraph: Don't see reason to have special case for bone's RNA path

4 years agoDepsgraph: SImplify chjecks in directly address bone
Sergey Sharybin [Mon, 4 Dec 2017 15:51:29 +0000 (16:51 +0100)]
Depsgraph: SImplify chjecks in directly address bone

4 years agoDepsgraph: begin use of RNAPathKey instead of re-implemented checks in driver variables
Sergey Sharybin [Mon, 4 Dec 2017 15:44:07 +0000 (16:44 +0100)]
Depsgraph: begin use of RNAPathKey instead of re-implemented checks in driver variables

4 years agoDepsgraph: Cleanup, don't use static qualifier inside of anonymous namespace
Sergey Sharybin [Mon, 4 Dec 2017 15:27:32 +0000 (16:27 +0100)]
Depsgraph: Cleanup, don't use static qualifier inside of anonymous namespace

4 years agoAdd utility function to compare PointerRNA with NULL
Sergey Sharybin [Mon, 4 Dec 2017 15:23:14 +0000 (16:23 +0100)]
Add utility function to compare PointerRNA with NULL

Thanks Campbell for review!

4 years agoDepsgraph: Correct RNA pointer criteria to deal with bone custom properties
Sergey Sharybin [Mon, 4 Dec 2017 15:02:09 +0000 (16:02 +0100)]
Depsgraph: Correct RNA pointer criteria to deal with bone custom properties

4 years agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 6 Dec 2017 05:51:37 +0000 (16:51 +1100)]
Merge branch 'master' into blender2.8

4 years agoFix T53441: Inset doesn't start at zero
Campbell Barton [Wed, 6 Dec 2017 05:45:51 +0000 (16:45 +1100)]
Fix T53441: Inset doesn't start at zero

4 years agoCleanup: line length
Campbell Barton [Wed, 6 Dec 2017 05:42:34 +0000 (16:42 +1100)]
Cleanup: line length

4 years agoCMake: remove git found message
Campbell Barton [Wed, 6 Dec 2017 05:37:50 +0000 (16:37 +1100)]
CMake: remove git found message

4 years agoCycles: Fix constness for load_kernels in device_cpu.cpp
Lukas Stockner [Tue, 5 Dec 2017 23:00:18 +0000 (00:00 +0100)]
Cycles: Fix constness for load_kernels in device_cpu.cpp

4 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Tue, 5 Dec 2017 21:38:13 +0000 (22:38 +0100)]
Merge branch 'master' into blender2.8

4 years agoFix T53476: File Browser: Selection Issue with 'fill' option.
Bastien Montagne [Tue, 5 Dec 2017 21:34:49 +0000 (22:34 +0100)]
Fix T53476: File Browser: Selection Issue with 'fill' option.

Fill-selection would only go upward in list of items to find an already
selected one and fill-select all items in-between. Now, in case upward
search fails, it will also intent to go downward, effectiviely allowing
to 'fill-select' from bottom to top.

Note that top-to-bottom keeps priority (i.e. if a top-to-bottom
fill-selection is possible, it will always happen, even if a
bottom-to-top one is also possible).

4 years agoMerge branch 'master' into blender2.8
Antonio Vazquez [Tue, 5 Dec 2017 18:04:34 +0000 (19:04 +0100)]
Merge branch 'master' into blender2.8

4 years agoFix T53430: Cut at the strip end fails w/ endstill
Campbell Barton [Tue, 5 Dec 2017 17:52:38 +0000 (04:52 +1100)]
Fix T53430: Cut at the strip end fails w/ endstill

4 years agoCMake: avoid checking each MSVC minor revision
Campbell Barton [Tue, 5 Dec 2017 16:38:44 +0000 (03:38 +1100)]
CMake: avoid checking each MSVC minor revision