blender.git
11 months agoMerge remote-tracking branch 'origin/blender2.8' into udim temp-udim-images
Lukas Stockner [Fri, 27 Jul 2018 19:42:50 +0000 (21:42 +0200)]
Merge remote-tracking branch 'origin/blender2.8' into udim

11 months agoAlways show active tile if the current image is tiled
Lukas Stockner [Thu, 26 Jul 2018 21:02:53 +0000 (23:02 +0200)]
Always show active tile if the current image is tiled

11 months agoImprove creating and saving tiled images
Lukas Stockner [Thu, 26 Jul 2018 20:58:45 +0000 (22:58 +0200)]
Improve creating and saving tiled images

11 months agoRevert last commit, was temporary
Lukas Stockner [Fri, 27 Jul 2018 19:42:09 +0000 (21:42 +0200)]
Revert last commit, was temporary

This reverts commit 8eee1a312b308460f8cae3022e87142164a01833.

11 months agoCleanup: Remove occurances of GPULamp
Clément Foucault [Fri, 27 Jul 2018 16:12:02 +0000 (18:12 +0200)]
Cleanup: Remove occurances of GPULamp

11 months agoGPUTexture: Fix wrong texture size check
Clément Foucault [Fri, 27 Jul 2018 15:50:14 +0000 (17:50 +0200)]
GPUTexture: Fix wrong texture size check

11 months agoEevee: Fix assert when baking lightprobes.
Clément Foucault [Fri, 27 Jul 2018 15:33:53 +0000 (17:33 +0200)]
Eevee: Fix assert when baking lightprobes.

The GPU context was freed before all framebuffer attached to it were
deleted.

Fix T56117

11 months agoMerge branch 'master' into blender2.8
Sergey Sharybin [Fri, 27 Jul 2018 15:21:43 +0000 (17:21 +0200)]
Merge branch 'master' into blender2.8

11 months agoSubsurf: Correction to origindex
Sergey Sharybin [Wed, 25 Jul 2018 08:30:11 +0000 (10:30 +0200)]
Subsurf: Correction to origindex

Only enforce origindex to NONE for a generated geometry. For the rest
of geometry rely on CustomData_copy() to set it to the proper value.

This will ensure origindex is set correct for cases when there is an
array modifier prior to subsurf.

11 months agoCycles: Initial implementation of detailed statistics
Sergey Sharybin [Fri, 27 Jul 2018 13:46:13 +0000 (15:46 +0200)]
Cycles: Initial implementation of detailed statistics

Gathers information about object geometry and textures. Very basic at
this moment, but need to start somewhere.

Things which needs to be included still:

- "Runtime" information, like BVH. While it is not directly controllable
  by artists, it's still important to know.

- Device array sizes. Again, not under artists control, but is added to
  the overall size.

- Memory peak at different synchronization stages.

At this point it simply prints info to the stdout after F12 is done,
need better control over that too.

Reviewers: brecht

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

11 months agoCycles: Add utility function to query graph node size in bytes
Sergey Sharybin [Fri, 27 Jul 2018 09:40:44 +0000 (11:40 +0200)]
Cycles: Add utility function to query graph node size in bytes

11 months agoGHOST: Fix SDL backend.
Clément Foucault [Fri, 27 Jul 2018 14:28:44 +0000 (16:28 +0200)]
GHOST: Fix SDL backend.

We use a hidden window for each offscreen context we need.

On X11 (linux) it does not show any other windows in the OS task bar
but it might be the case on other operating systems (untested).

11 months agoWorkbench: option to change background
Jeroen Bakker [Fri, 27 Jul 2018 13:05:46 +0000 (15:05 +0200)]
Workbench: option to change background

Replaced the draw world option with a shading.background_type enum.
Where the user can select Theme, World or a Custom color.

World and theme colors do not always work in workbench. We needed to
have an option what the user could control locally (per viewport).
Especially when using linked data.

I removed the world background drawing from the draw_manager. It was never used as EEVEE and Workbench both override the logic.

Not 100% sure about the naming of Theme, World, Viewport.
In other parts of blender's codebase World is sometimes called Scene.
Will stick to the names that describes its location best.

{F3990139}

Reviewers: fclem, campbellbarton

Reviewed By: fclem

Subscribers: venomgfx

Tags: #bf_blender_2.8

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

11 months agoFix crash enabling disabled collection containing curves.
Brecht Van Lommel [Fri, 27 Jul 2018 12:13:47 +0000 (14:13 +0200)]
Fix crash enabling disabled collection containing curves.

Fixes T55948, T56016, T55926, T55947.

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

11 months agoFix GPU build error after recent commit.
Brecht Van Lommel [Fri, 27 Jul 2018 12:15:45 +0000 (14:15 +0200)]
Fix GPU build error after recent commit.

11 months agoDRW: Fix Race condition in defered compilation
Clément Foucault [Fri, 27 Jul 2018 11:57:46 +0000 (13:57 +0200)]
DRW: Fix Race condition in defered compilation

11 months agoFix T55888: Eevee: crash when shadow cube size is > 512px
Clément Foucault [Fri, 27 Jul 2018 11:56:07 +0000 (13:56 +0200)]
Fix T55888: Eevee: crash when shadow cube size is > 512px

Note that this was only reported to happen on AMD GPU + windows.

11 months agoFix T55744: Assertion failure using the Knife angle constraint option
Clément Foucault [Fri, 27 Jul 2018 10:15:39 +0000 (12:15 +0200)]
Fix T55744: Assertion failure using the Knife angle constraint option

11 months agoRNA: Set default for Camera properties
Clément Foucault [Thu, 26 Jul 2018 10:29:16 +0000 (12:29 +0200)]
RNA: Set default for Camera properties

Change the default clipend value to match the viewport (1000.0f)

11 months agoUI: Fix error in camera property panel
Clément Foucault [Thu, 26 Jul 2018 10:28:12 +0000 (12:28 +0200)]
UI: Fix error in camera property panel

11 months agoFix T56092: command line arguments after -- beginning with -h don't work.
Brecht Van Lommel [Fri, 27 Jul 2018 09:34:52 +0000 (11:34 +0200)]
Fix T56092: command line arguments after -- beginning with -h don't work.

11 months agoCycles: Cleanup, indentation
Sergey Sharybin [Fri, 27 Jul 2018 09:19:29 +0000 (11:19 +0200)]
Cycles: Cleanup, indentation

11 months agoCycles: Cleanup, indentation
Sergey Sharybin [Fri, 27 Jul 2018 09:09:10 +0000 (11:09 +0200)]
Cycles: Cleanup, indentation

11 months agoCycles: Cleanup, spelling
Sergey Sharybin [Fri, 27 Jul 2018 08:30:10 +0000 (10:30 +0200)]
Cycles: Cleanup, spelling

11 months agoCycles: Cleanup, indentation
Sergey Sharybin [Fri, 27 Jul 2018 08:28:28 +0000 (10:28 +0200)]
Cycles: Cleanup, indentation

11 months agoCycles: Cleanup, line length
Sergey Sharybin [Fri, 27 Jul 2018 08:28:06 +0000 (10:28 +0200)]
Cycles: Cleanup, line length

11 months agoCycles: Cleanup, move functions outside of class methods
Sergey Sharybin [Fri, 27 Jul 2018 08:24:03 +0000 (10:24 +0200)]
Cycles: Cleanup, move functions outside of class methods

There is no reason or justification to have helper functions as
class methods: they do not depend on anything in the class itself.

There are probably more cases like that.

11 months agoCycles: Cleanup, remove unused function
Sergey Sharybin [Fri, 27 Jul 2018 08:22:45 +0000 (10:22 +0200)]
Cycles: Cleanup, remove unused function

11 months agoCycles: Cleanup in image manager, switch statement instead of if-else
Sergey Sharybin [Fri, 27 Jul 2018 08:16:30 +0000 (10:16 +0200)]
Cycles: Cleanup in image manager, switch statement instead of if-else

Allows to catch enumerator values which are missing from being handled.

Also use `const char*`, no need to construct string just to throw it away.

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Fri, 27 Jul 2018 07:41:58 +0000 (17:41 +1000)]
Merge branch 'master' into blender2.8

11 months agoFix Vector.project crash w/ >4 length vectors
Campbell Barton [Fri, 27 Jul 2018 07:40:01 +0000 (17:40 +1000)]
Fix Vector.project crash w/ >4 length vectors

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Fri, 27 Jul 2018 07:09:38 +0000 (17:09 +1000)]
Merge branch 'master' into blender2.8

11 months agoFix T55991: Python ignores scene switch argument
Campbell Barton [Fri, 27 Jul 2018 06:49:41 +0000 (16:49 +1000)]
Fix T55991: Python ignores scene switch argument

11 months agoCorrect arguments for callback
Campbell Barton [Fri, 27 Jul 2018 06:41:18 +0000 (16:41 +1000)]
Correct arguments for callback

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Fri, 27 Jul 2018 01:01:01 +0000 (11:01 +1000)]
Merge branch 'master' into blender2.8

11 months agoFix T56074: Remove doubles creates holes
Campbell Barton [Fri, 27 Jul 2018 00:51:42 +0000 (10:51 +1000)]
Fix T56074: Remove doubles creates holes

Own regression when moving remove-doubles to kd-tree
(seems to happen only in rare cases).

11 months agoUI: Tooltip tweaks for Display Mode
Pablo Vazquez [Fri, 27 Jul 2018 00:13:52 +0000 (02:13 +0200)]
UI: Tooltip tweaks for Display Mode

Keep UI -> Keep User Interface, and don't use the word UI again in the tooltip.

11 months agoUI: Help menu minor tweaks
Pablo Vazquez [Fri, 27 Jul 2018 00:02:11 +0000 (02:02 +0200)]
UI: Help menu minor tweaks

Show "Operators Cheatsheet" and Python API link only when developers extra is enabled.
Fix URL for User Communities, Developer Community and Release Notes (which 404s
now just like the wiki anyway since the page for 2.80 is being made).

11 months agoFix assert in snapEditMesh.
mano-wii [Thu, 26 Jul 2018 16:48:26 +0000 (13:48 -0300)]
Fix assert in snapEditMesh.

11 months agoa
Lukas Stockner [Thu, 26 Jul 2018 16:22:19 +0000 (18:22 +0200)]
a

11 months agoCycles: Add reflection fix to Bump and Normal Map nodes
Lukas Stockner [Thu, 26 Jul 2018 14:48:15 +0000 (16:48 +0200)]
Cycles: Add reflection fix to Bump and Normal Map nodes

While changing the shading normal is a great way to add additional detail to a model, there are some problems with it.
One of them is that at grazing angles and/or strong changes to the normal, the reflected ray can end up pointing into the actual geometry, which results in a black spot.

This patch helps avoid this by automatically reducing the strength of the bump/normal map if the reflected direction would end up too shallow or inside the geometry.

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

11 months agoFix compiling after ui cleanups
Jens Verwiebe [Thu, 26 Jul 2018 12:21:15 +0000 (14:21 +0200)]
Fix compiling after ui cleanups

11 months agoUI: Use Single Column and Grid Flow layout for Physics Cloth
Vuk Gardašević [Thu, 26 Jul 2018 10:33:31 +0000 (12:33 +0200)]
UI: Use Single Column and Grid Flow layout for Physics Cloth

See D3559

11 months agoCleanup: unused args
Campbell Barton [Thu, 26 Jul 2018 09:51:56 +0000 (19:51 +1000)]
Cleanup: unused args

11 months agoUI: Single column layout and sub-panels for Rigid Body Physics panels
William Reynish [Thu, 26 Jul 2018 09:39:29 +0000 (11:39 +0200)]
UI: Single column layout and sub-panels for Rigid Body Physics panels

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 26 Jul 2018 08:39:57 +0000 (18:39 +1000)]
Merge branch 'master' into blender2.8

11 months agoWM: replace UI draw callbacks w/ property poll
Campbell Barton [Thu, 26 Jul 2018 07:35:33 +0000 (17:35 +1000)]
WM: replace UI draw callbacks w/ property poll

Custom drawing functions were used just to control property display.
Move to poll function.

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 26 Jul 2018 05:51:29 +0000 (15:51 +1000)]
Merge branch 'master' into blender2.8

11 months agoUI: hide transform constraints when not used
Campbell Barton [Thu, 26 Jul 2018 05:44:27 +0000 (15:44 +1000)]
UI: hide transform constraints when not used

11 months agoCleanup: remove redundant flag
Campbell Barton [Thu, 26 Jul 2018 04:58:36 +0000 (14:58 +1000)]
Cleanup: remove redundant flag

Caller can pass this flag if necessary.

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 26 Jul 2018 04:49:52 +0000 (14:49 +1000)]
Merge branch 'master' into blender2.8

11 months agoWM: remove duplicate ui-list functions
Campbell Barton [Thu, 26 Jul 2018 04:46:33 +0000 (14:46 +1000)]
WM: remove duplicate ui-list functions

Missed when moving into own file.

Caused issues on MSVC, not GCC.

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 26 Jul 2018 03:50:56 +0000 (13:50 +1000)]
Merge branch 'master' into blender2.8

11 months agoUI: hide proportional transform options
Campbell Barton [Thu, 26 Jul 2018 01:13:38 +0000 (11:13 +1000)]
UI: hide proportional transform options

Adds property poll function to transform.

11 months agoWM: Add operator property poll callback
Campbell Barton [Wed, 25 Jul 2018 23:59:56 +0000 (09:59 +1000)]
WM: Add operator property poll callback

This allows operators to filter out properties from the
auto-generated draw functions.

Some custom draw functions can move to using this.

11 months agoCleanup: Use const argument
Campbell Barton [Thu, 26 Jul 2018 01:07:56 +0000 (11:07 +1000)]
Cleanup: Use const argument

11 months agoUI: More opaque type icons in the Outliner
Pablo Vazquez [Thu, 26 Jul 2018 00:42:20 +0000 (02:42 +0200)]
UI: More opaque type icons in the Outliner

Also always draw the counter of elements-per-type with a dark background
regardless of the active status. It being white when active affects
readability since the icon background itself is already highlighted.

Thanks devtalk forum for feedback.

11 months agoMerge branch 'master' into blender2.8
Bastien Montagne [Wed, 25 Jul 2018 19:12:04 +0000 (21:12 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/rigidbody.c

11 months agoFix T55964: Direction not normalized in isect_ray_aabb_v3_simple()?
Bastien Montagne [Wed, 25 Jul 2018 19:05:44 +0000 (21:05 +0200)]
Fix T55964: Direction not normalized in isect_ray_aabb_v3_simple()?

RNA API Object.ray_cast would not normalize direction vector before
doing first quick bbox intersection test, while using its returned
distance value. This could lead to wrong exclusion of object.
Thanks to @codemanx for finding that issue.

11 months agoFix (unreported) potential div-by-zero in ray/bbox intersection BLI code.
Bastien Montagne [Wed, 25 Jul 2018 19:04:28 +0000 (21:04 +0200)]
Fix (unreported) potential div-by-zero in ray/bbox intersection BLI code.

Also added note that direction parameter should be normalized vector
in case one intend to use returned distance values.

11 months agoFix crash Cycles rendering with --debug-value 256.
Brecht Van Lommel [Wed, 25 Jul 2018 17:15:20 +0000 (19:15 +0200)]
Fix crash Cycles rendering with --debug-value 256.

11 months agoFix for holdout / indirect only with collection instances.
Brecht Van Lommel [Wed, 25 Jul 2018 16:30:26 +0000 (18:30 +0200)]
Fix for holdout / indirect only with collection instances.

11 months agoUI: Sort panels in mesh context
Pablo Vazquez [Wed, 25 Jul 2018 14:48:04 +0000 (16:48 +0200)]
UI: Sort panels in mesh context

Also collapse by default the less frequented Face Maps and Normals

11 months agoCycles: add per layer collection indirectly on setting.
Brecht Van Lommel [Wed, 25 Jul 2018 10:26:09 +0000 (12:26 +0200)]
Cycles: add per layer collection indirectly on setting.

In the outliner, right click > view layer > set indirect only. This is
like clearing camera ray visibility on objects in the collection, and is
temporary until we have more general dynamic overrides.

11 months agoUI: Single column and subpanels for Particles Physics Fluids and Boids
William Reynish [Wed, 25 Jul 2018 14:12:04 +0000 (16:12 +0200)]
UI: Single column and subpanels for Particles Physics Fluids and Boids

11 months agoCycles: add per layer collection mask/holdout support.
Brecht Van Lommel [Wed, 25 Jul 2018 10:26:09 +0000 (12:26 +0200)]
Cycles: add per layer collection mask/holdout support.

In the outliner, right click > view layer > set holdout. This is
temporary until we have more general dynamic overrides, but helps
Spring production for now.

11 months agoCleanup: mark missing Cycles view layer override features with TODO.
Brecht Van Lommel [Wed, 25 Jul 2018 10:35:27 +0000 (12:35 +0200)]
Cleanup: mark missing Cycles view layer override features with TODO.

11 months agoUI: Dynamic Paint single column and sub panels
William Reynish [Wed, 25 Jul 2018 13:57:30 +0000 (15:57 +0200)]
UI: Dynamic Paint single column and sub panels

11 months agoUI: Node Editor Properties single column
Pablo Vazquez [Wed, 25 Jul 2018 13:04:19 +0000 (15:04 +0200)]
UI: Node Editor Properties single column

Color and Properties panels as sub-panels of Node. Collapse Node properties
by default, since they are already in the node itself and in material properties.

11 months agoFix T55895: VSE crash while moving a strip
Bastien Montagne [Wed, 25 Jul 2018 12:52:29 +0000 (14:52 +0200)]
Fix T55895: VSE crash while moving a strip

Glitch from multi-edit project. ;)

11 months agoUI: Texture Properties Layout and Cleanup
Vuk Gardašević [Wed, 25 Jul 2018 12:01:01 +0000 (14:01 +0200)]
UI: Texture Properties Layout and Cleanup

Initial work on single column layout, flow and organization of
the texture properties. More work needs to be done in the C templates
for image textures.

See D3557

11 months agoUI: Minor tweaks to nodes
Pablo Vazquez [Wed, 25 Jul 2018 10:53:15 +0000 (12:53 +0200)]
UI: Minor tweaks to nodes

Match roundness with widget defaults and collapse triangle size with panel's.
Interaction is the same, just an aesthetic tweak.

11 months agoUI: Add "New" and "Open..." to the File Context Menu
Pablo Vazquez [Wed, 25 Jul 2018 09:56:37 +0000 (11:56 +0200)]
UI: Add "New" and "Open..." to the File Context Menu

Puts both operators at easy reach with the left hand since the
shortcuts for these are somewhat cumbersome (Ctrl+O/Ctrl+N)

11 months agoFix missing particle use count object names with disabled particles.
Brecht Van Lommel [Wed, 25 Jul 2018 09:39:32 +0000 (11:39 +0200)]
Fix missing particle use count object names with disabled particles.

11 months agoKeymap: Use 1..4 to change UV select modes
Campbell Barton [Wed, 25 Jul 2018 01:02:12 +0000 (11:02 +1000)]
Keymap: Use 1..4 to change UV select modes

Support for sync selection switching which keys apply.

11 months agoWM: keymap utility to set enum from a key range
Campbell Barton [Wed, 25 Jul 2018 01:00:03 +0000 (11:00 +1000)]
WM: keymap utility to set enum from a key range

11 months agoFix mistake in fix for T55798
Campbell Barton [Tue, 24 Jul 2018 23:23:07 +0000 (09:23 +1000)]
Fix mistake in fix for T55798

11 months agoCorrection on the last commit.
Germano [Tue, 24 Jul 2018 22:45:03 +0000 (19:45 -0300)]
Correction on the last commit.

11 months agoFix base->flag and base->flag_legacy: The flags of the Transform operator are being...
Germano [Tue, 24 Jul 2018 22:34:49 +0000 (19:34 -0300)]
Fix base->flag and base->flag_legacy: The flags of the Transform operator are being added to the bases of the not evaluated view_layer.

But I'm not sure if the flags `BA_WAS_SEL`,` BASE_SELECTED` and `BA_SNAP_FIX_DEPS_FIASCO`(lol XD) should be added to the bases of the not evaluated `view_layer`. This needs to be discussed.

11 months agoFix T55798: Crash when snapping objects with data recalculated by modifiers.
Germano [Tue, 24 Jul 2018 22:13:28 +0000 (19:13 -0300)]
Fix T55798: Crash when snapping objects with data recalculated by modifiers.

Although the default behavior is for these objects to be ignored during the snap operation, this should not crash.

11 months agoRNA: Remove Unused dof.is_hq_supported and dof.use_high_quality
Clément Foucault [Tue, 24 Jul 2018 15:59:46 +0000 (17:59 +0200)]
RNA: Remove Unused dof.is_hq_supported and dof.use_high_quality

It's not necessary anymore since we assume it's always high quality.

11 months agoFix T55754: DOF with new Camera is not working
Clément Foucault [Tue, 24 Jul 2018 15:57:24 +0000 (17:57 +0200)]
Fix T55754: DOF with new Camera is not working

Was due to non initialized gpu_dof.ratio

11 months agoFix presets not working after Python refactoring.
Brecht Van Lommel [Tue, 24 Jul 2018 15:29:53 +0000 (17:29 +0200)]
Fix presets not working after Python refactoring.

11 months agoWorkbench: Fix missing geometry on Iris 640/630 GPUs
Clément Foucault [Tue, 24 Jul 2018 14:50:31 +0000 (16:50 +0200)]
Workbench: Fix missing geometry on Iris 640/630 GPUs

For some reason 32c5972653041a3423122b5a5ae791ef536b87ed broke display of
solid meshes in workbench.

After some investigation, it seems that the vertex coordinate output is
degenerated even if the input is correct and the matrix too.

Removing dead code seems to fix the problem. So maybe the GLSL preprocessor
is not doing what it should?

11 months agoFix T56079: crash with startup.blend saved in sculpt/paint modes.
Brecht Van Lommel [Tue, 24 Jul 2018 10:43:21 +0000 (12:43 +0200)]
Fix T56079: crash with startup.blend saved in sculpt/paint modes.

This reverts commit 81a93df6d22c2f148667b9a6e8308e083a4cec39, it is not safe
to handle initialization for startup.blend differently. Instead fix the root
issue of the preview icon data structures not being initialized in time.

11 months agoFix T56081: crash with make static override and linked collection.
Brecht Van Lommel [Tue, 24 Jul 2018 10:02:24 +0000 (12:02 +0200)]
Fix T56081: crash with make static override and linked collection.

11 months agoFix T55721: crashes with collections panel in object properties.
Brecht Van Lommel [Tue, 24 Jul 2018 09:37:27 +0000 (11:37 +0200)]
Fix T55721: crashes with collections panel in object properties.

11 months agoFix T55245: undo with multiple windows and view layers not working correct.
Brecht Van Lommel [Tue, 24 Jul 2018 09:21:32 +0000 (11:21 +0200)]
Fix T55245: undo with multiple windows and view layers not working correct.

11 months agoFix incorrect active object setting in scripts.
Brecht Van Lommel [Tue, 24 Jul 2018 09:18:45 +0000 (11:18 +0200)]
Fix incorrect active object setting in scripts.

11 months agoFix incorrect object visibility test in baking.
Brecht Van Lommel [Tue, 24 Jul 2018 09:08:58 +0000 (11:08 +0200)]
Fix incorrect object visibility test in baking.

11 months agoMotion paths: default to bone head instead of tail location.
Brecht Van Lommel [Mon, 23 Jul 2018 14:38:25 +0000 (16:38 +0200)]
Motion paths: default to bone head instead of tail location.

This puts the motion path in the same location as the transform gizmo,
which is less confusing especially if you have a custom bone shape where
the tail is not visible.

11 months agoFix T55958: allow the user to select between spring and spring2.
Alexander Gavrilov [Sat, 14 Jul 2018 14:01:02 +0000 (17:01 +0300)]
Fix T55958: allow the user to select between spring and spring2.

The old springs with damping 1.0 operate in a special way that
is more similar to plastic deformation than a spring. Some users
rely on that, so let the user choose which implementation to use.
This also restores full backward compatibility with 2.79.

Reviewers: sergof

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

11 months agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 24 Jul 2018 05:35:01 +0000 (15:35 +1000)]
Merge branch 'master' into blender2.8

11 months agoCleanup: changes from 2.8
Campbell Barton [Tue, 24 Jul 2018 03:54:25 +0000 (13:54 +1000)]
Cleanup: changes from 2.8

11 months agoSubsurf: Fix wrong vertices index in vertex data interpolation
Sergey Sharybin [Mon, 23 Jul 2018 17:09:16 +0000 (19:09 +0200)]
Subsurf: Fix wrong vertices index in vertex data interpolation

11 months agoSubsurf: Subdivide polygons to the same resolution
Sergey Sharybin [Mon, 23 Jul 2018 16:40:04 +0000 (18:40 +0200)]
Subsurf: Subdivide polygons to the same resolution

Previously it was ptex faces which were subdividing to the same
resolution. This was looking like more details for non-quad faces,
but was also causing discontinuity in the edge where quad touches
non-quad polygon.

Now ptex faces which are coming from non-quad faces are subdivided
at a half of resolution, matching old behavior and solving
discontinuity problem.

11 months agoFix compilation issue after merge.
Clément Foucault [Mon, 23 Jul 2018 16:56:24 +0000 (18:56 +0200)]
Fix compilation issue after merge.

11 months agoUI: Fix flicker in File Browser header
Pablo Vazquez [Mon, 23 Jul 2018 16:41:12 +0000 (18:41 +0200)]
UI: Fix flicker in File Browser header

Move running jobs to the beginning of the row.

Thanks @sergey for reporting

11 months agoFix missing header include in previous master merge.
Bastien Montagne [Mon, 23 Jul 2018 16:37:29 +0000 (18:37 +0200)]
Fix missing header include in previous master merge.

11 months agoMerge branch 'master' into blender2.8
Bastien Montagne [Mon, 23 Jul 2018 15:52:52 +0000 (17:52 +0200)]
Merge branch 'master' into blender2.8

Note: Moved doversion of VSE strips uniquename to 2.8 versionning area,
and raised accordingly current file subversion, since that bug also
affected previous 2.8 .blend files...

Conflicts:
source/blender/blenkernel/BKE_blender_version.h