blender.git
2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 20 Aug 2018 07:53:53 +0000 (17:53 +1000)]
Merge branch 'master' into blender2.8

2 years agoFix: Theme colors for datablock channels were missing for the NLA in the new default...
Joshua Leung [Mon, 20 Aug 2018 06:26:46 +0000 (18:26 +1200)]
Fix: Theme colors for datablock channels were missing for the NLA in the new default theme

2 years agoMotion Paths UI: "Update from Scene Range" operator
Joshua Leung [Mon, 20 Aug 2018 04:12:37 +0000 (16:12 +1200)]
Motion Paths UI: "Update from Scene Range" operator

Make it easier to update the frame range for motion paths from
the Scene's current frame range (render or preview range)

2 years agoFix BMesh edge_bisect, edge_percent being ignored
Andrew Hale [Mon, 20 Aug 2018 03:23:32 +0000 (13:23 +1000)]
Fix BMesh edge_bisect, edge_percent being ignored

Also fix float/int/bool access methods

2 years agoCleanup: unused warning
Campbell Barton [Mon, 20 Aug 2018 01:29:23 +0000 (11:29 +1000)]
Cleanup: unused warning

2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 20 Aug 2018 01:27:49 +0000 (11:27 +1000)]
Merge branch 'master' into blender2.8

2 years agoCleanup: trailing space
Campbell Barton [Mon, 20 Aug 2018 01:24:14 +0000 (11:24 +1000)]
Cleanup: trailing space

2 years agoRNA: Spline.calc_length() utility function
Campbell Barton [Mon, 20 Aug 2018 01:10:09 +0000 (11:10 +1000)]
RNA: Spline.calc_length() utility function

D1810 by @Matpi w/ edits

2 years agobuild_environment: fix build issues with alembic
Ray Molenkamp [Sun, 19 Aug 2018 23:47:16 +0000 (17:47 -0600)]
build_environment: fix build issues with alembic

-read all headers from openexr not ilmbase
-add missing iexmath lib
-turn binaries back on, the blender unit tests require them.

2 years agoWorkbench: hide background option for OpenGL render
Jeroen Bakker [Sun, 19 Aug 2018 18:25:36 +0000 (20:25 +0200)]
Workbench: hide background option for OpenGL render

When OpenGL renderer is selected the option for background colors are
displayed, but ignored. For now we hide this option as it makes no sense
to have a viewport color option without viewport or render a 'final'
with a theme color.

2 years agobuild_environment: windows harvest cleanup.
Ray Molenkamp [Sun, 19 Aug 2018 17:39:32 +0000 (11:39 -0600)]
build_environment: windows harvest cleanup.

remove the commands that have already moved to the individual cmake files.

2 years agobuild_environment: opencolorio buildfixes for windows.
Ray Molenkamp [Sun, 19 Aug 2018 17:38:48 +0000 (11:38 -0600)]
build_environment: opencolorio buildfixes for windows.

copy the debug libs to the right place.

2 years agobuild_environment: openexr windows buildfix.
Ray Molenkamp [Sun, 19 Aug 2018 17:38:13 +0000 (11:38 -0600)]
build_environment: openexr windows buildfix.

with the namespaces disabled the postfix also changed.

2 years agobuild_environment: buildfixes for boost
Ray Molenkamp [Sun, 19 Aug 2018 17:37:16 +0000 (11:37 -0600)]
build_environment: buildfixes for boost

Disable hardcoded 64 bit build.

2 years agobuild_environment: build fixes for openimageio.
Ray Molenkamp [Sun, 19 Aug 2018 17:36:03 +0000 (11:36 -0600)]
build_environment: build fixes for openimageio.

disable testtex due to parameter alignment issues

2 years agobuild_environment: windows environment
Ray Molenkamp [Sun, 19 Aug 2018 17:34:49 +0000 (11:34 -0600)]
build_environment: windows environment

get 32 bit and 64 bit compilers on the same gcc version.

2 years agobuild_environment: python windows build fixes
Ray Molenkamp [Sun, 19 Aug 2018 17:32:21 +0000 (11:32 -0600)]
build_environment: python windows build fixes

fix hardcoded ssl dll names.

2 years agobuild_environment: opensubdiv windows build fixes.
Ray Molenkamp [Sun, 19 Aug 2018 17:29:55 +0000 (11:29 -0600)]
build_environment: opensubdiv windows build fixes.

only build cuda on 64 bit, since 32 bit is no longer supported by nvcc

2 years agobuild_environment: opennvdb windows build fixes.
Ray Molenkamp [Sun, 19 Aug 2018 17:29:04 +0000 (11:29 -0600)]
build_environment: opennvdb windows build fixes.

disable openexr namespaces on windows due to linker errors with it.
link pthreads due to dependency though blosc

2 years agobuild_environment: openexr disable namespaces on windows.
Ray Molenkamp [Sun, 19 Aug 2018 17:25:27 +0000 (11:25 -0600)]
build_environment: openexr disable namespaces on windows.

Things do not end up in the right namespaces quite yet, and cause linker errors with other projects using the library.

2 years agobuild_environment: blosc build fixes.
Ray Molenkamp [Sun, 19 Aug 2018 17:24:08 +0000 (11:24 -0600)]
build_environment: blosc build fixes.

blosc embedded a copy of zlib/pthreads causing duplicate symbol linker errors. pthreads was windows specific, but zlib may apply to other platforms as well.

2 years agoFix T56450: Crash with bevel modifier.
Bastien Montagne [Sun, 19 Aug 2018 14:54:34 +0000 (16:54 +0200)]
Fix T56450: Crash with bevel modifier.

POinters shall always be explicitely handled in modifier copying code,
as well as reading code! Runtime ones shall just be NULL-ed.

2 years agoUI: rename 'Apron' to 'Click Anywhere'
Campbell Barton [Sun, 19 Aug 2018 05:20:21 +0000 (15:20 +1000)]
UI: rename 'Apron' to 'Click Anywhere'

2 years agoGP: Reduce updates of material previews
Antonioya [Sat, 18 Aug 2018 14:24:18 +0000 (16:24 +0200)]
GP: Reduce updates of material previews

If there is a update in progress, don't update again.

2 years agoDRW: Fix crash in defered compilation
Clément Foucault [Sat, 18 Aug 2018 10:57:42 +0000 (12:57 +0200)]
DRW: Fix crash in defered compilation

2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sat, 18 Aug 2018 09:18:55 +0000 (19:18 +1000)]
Merge branch 'master' into blender2.8

2 years agoArrrg, fix for previous commit :/
Bastien Montagne [Sat, 18 Aug 2018 08:25:00 +0000 (10:25 +0200)]
Arrrg, fix for previous commit :/

2 years agoFix T56439: Crash removing Rigid Body World.
Bastien Montagne [Sat, 18 Aug 2018 08:20:38 +0000 (10:20 +0200)]
Fix T56439: Crash removing Rigid Body World.

Need to rebuild the graph when we add or remove rigidbody world!

2 years agoStatic Override: make hidden & co flags of object overridable.
Bastien Montagne [Sat, 18 Aug 2018 08:08:28 +0000 (10:08 +0200)]
Static Override: make hidden & co flags of object overridable.

2 years agoStatic Override: link newly overridden collection to scene.
Bastien Montagne [Sat, 18 Aug 2018 08:05:54 +0000 (10:05 +0200)]
Static Override: link newly overridden collection to scene.

This avoids getting all overridden objects from said collection
instantiated in master collection, totally untidy!

Note that there is still an issue when 'active' object (i.e. the
armature usually) is in hidden sub-collection, since you have to make
that whole hidden collection visible again to see it.

We'll need to support moving objects into overridden collections am
afraid, arg. :(

2 years agoWarn when app-template isn't found
Campbell Barton [Fri, 17 Aug 2018 07:05:04 +0000 (17:05 +1000)]
Warn when app-template isn't found

2 years agoWM: app-template command line override
Campbell Barton [Fri, 17 Aug 2018 06:34:51 +0000 (16:34 +1000)]
WM: app-template command line override

Without this, there was no simple way to have
launchers for different app-templates.

Also allows force-disabling the app-template stored in the preferences.

2 years agocmake: fix typo in else()
Ray Molenkamp [Fri, 17 Aug 2018 20:14:26 +0000 (14:14 -0600)]
cmake: fix typo in else()

2 years agoUI: save statusbar/topbar collapsed state per screen.
Brecht Van Lommel [Fri, 17 Aug 2018 15:32:36 +0000 (17:32 +0200)]
UI: save statusbar/topbar collapsed state per screen.

This can now also be set from the Window menu in addition to dragging.

2 years agoFix GPU_viewport size asserts in some cases.
Brecht Van Lommel [Fri, 17 Aug 2018 18:14:06 +0000 (20:14 +0200)]
Fix GPU_viewport size asserts in some cases.

Now always tag for redraw when region size is changed instead of relying on
a redraw tag having been done elsewhere.

2 years agocmake/ctest: output test binaries to debug/release folders on windows.
Ray Molenkamp [Fri, 17 Aug 2018 16:04:55 +0000 (10:04 -0600)]
cmake/ctest: output test binaries to debug/release folders on windows.

debug/release builds were writing the binaries to the same folder

2 years agobuild_environment: Various tweaks needed for windows debug libs.
Ray Molenkamp [Fri, 17 Aug 2018 15:20:40 +0000 (09:20 -0600)]
build_environment: Various tweaks needed for windows debug libs.

2 years agoFix missing shader compilation progress bar.
Brecht Van Lommel [Fri, 17 Aug 2018 13:36:47 +0000 (15:36 +0200)]
Fix missing shader compilation progress bar.

2 years agobuild_environment: fix mistaken commit in openexr.
Ray Molenkamp [Fri, 17 Aug 2018 12:30:27 +0000 (06:30 -0600)]
build_environment: fix mistaken commit in openexr.

2 years agoFix more image editor Python errors after switching workspaces.
Brecht Van Lommel [Fri, 17 Aug 2018 11:09:59 +0000 (13:09 +0200)]
Fix more image editor Python errors after switching workspaces.

2 years agoGP: Increase stats file size
Antonioya [Fri, 17 Aug 2018 11:49:40 +0000 (13:49 +0200)]
GP: Increase stats file size

For big files, the size of the field for number of points  was not enough

2 years agoWorkbench: Fix buggy shadow
Clément Foucault [Fri, 17 Aug 2018 11:04:18 +0000 (13:04 +0200)]
Workbench: Fix buggy shadow

Was caused by shadow bbox not being updated.

2 years agoObject Mode: Add back the extra object axes drawing option
Clément Foucault [Fri, 17 Aug 2018 10:17:27 +0000 (12:17 +0200)]
Object Mode: Add back the extra object axes drawing option

2 years agoObject Mode: Use same empty (arrow) drawing as the bone axes display
Clément Foucault [Fri, 17 Aug 2018 10:16:50 +0000 (12:16 +0200)]
Object Mode: Use same empty (arrow) drawing as the bone axes display

2 years agoMerge branch 'master' into blender2.8
Brecht Van Lommel [Fri, 17 Aug 2018 11:00:52 +0000 (13:00 +0200)]
Merge branch 'master' into blender2.8

2 years agoFix error with image editor toolsystem when switching to some workspaces.
Brecht Van Lommel [Fri, 17 Aug 2018 10:59:24 +0000 (12:59 +0200)]
Fix error with image editor toolsystem when switching to some workspaces.

2 years agoCleanup: fix harmless compiler warnings.
Brecht Van Lommel [Thu, 16 Aug 2018 15:10:17 +0000 (17:10 +0200)]
Cleanup: fix harmless compiler warnings.

2 years agoBuild Environment: fixes for Linux after recent updates.
Brecht Van Lommel [Fri, 17 Aug 2018 10:40:31 +0000 (12:40 +0200)]
Build Environment: fixes for Linux after recent updates.

2 years agoFix engine.camera_model_matrix() not working in the Python API.
Brecht Van Lommel [Fri, 17 Aug 2018 10:28:27 +0000 (12:28 +0200)]
Fix engine.camera_model_matrix() not working in the Python API.

2 years agoPhysics Rigid Body: Use Single Column and Grid Flow layout
Vuk GardaÅ¡eviÄ\87 [Fri, 17 Aug 2018 10:05:16 +0000 (12:05 +0200)]
Physics Rigid Body: Use Single Column and Grid Flow layout

(and Rigid Body Constraint)

See D3613

2 years agoPhysics Soft Body: Use Single Column and Grid Flow layout
Vuk GardaÅ¡eviÄ\87 [Fri, 17 Aug 2018 10:04:26 +0000 (12:04 +0200)]
Physics Soft Body: Use Single Column and Grid Flow layout

See D3612

2 years agoPhysics Dynamic Paint: Use Grid Flow, sub-panels layout
Vuk GardaÅ¡eviÄ\87 [Fri, 17 Aug 2018 10:03:39 +0000 (12:03 +0200)]
Physics Dynamic Paint: Use Grid Flow, sub-panels layout

See D3611

2 years agoPhysics Force Field and Collision: Use Single Column and Grid Flow layout
Vuk GardaÅ¡eviÄ\87 [Fri, 17 Aug 2018 10:02:33 +0000 (12:02 +0200)]
Physics Force Field and Collision: Use Single Column and Grid Flow layout

See D3609

2 years agoPhysics Common: Use Single Column and Grid Flow layout
Vuk GardaÅ¡eviÄ\87 [Fri, 17 Aug 2018 10:01:13 +0000 (12:01 +0200)]
Physics Common: Use Single Column and Grid Flow layout

See D3605

2 years agoPhysics Smoke: Use Single Column and Grid Flow layout
Vuk GardaÅ¡eviÄ\87 [Fri, 17 Aug 2018 09:58:21 +0000 (11:58 +0200)]
Physics Smoke: Use Single Column and Grid Flow layout

See D3567

2 years agoPhysics Fluid: Use Single Column and Grid Flow layout
Vuk Gardašević [Fri, 17 Aug 2018 09:57:24 +0000 (11:57 +0200)]
Physics Fluid: Use Single Column and Grid Flow layout

2 years agoGP: Fix fast drawing error
Antonioya [Fri, 17 Aug 2018 09:08:56 +0000 (11:08 +0200)]
GP: Fix fast drawing error

During the modifications of the drawing engine, this was changed by error.

2 years agoMultires: Fix wrong creation of multires mesh
Sergey Sharybin [Thu, 16 Aug 2018 15:00:24 +0000 (17:00 +0200)]
Multires: Fix wrong creation of multires mesh

Should use evaluated object to query deformed mesh from.

2 years agobuild_environment: small fix for building ocio on windows.
Ray Molenkamp [Thu, 16 Aug 2018 23:42:06 +0000 (17:42 -0600)]
build_environment: small fix for building ocio on windows.

2 years agobuild_environment: osl 1.9.9
Ray Molenkamp [Thu, 16 Aug 2018 23:41:35 +0000 (17:41 -0600)]
build_environment: osl 1.9.9

does no longer seem to bundle pugixml, so that's a new dependency.

2 years agobuild environment: fix opencollada build on macOS
Arto Kitula [Thu, 16 Aug 2018 22:24:05 +0000 (01:24 +0300)]
build environment: fix opencollada build on macOS

2 years agoArmature: Add ghosting support (old x-ray)
Clément Foucault [Thu, 16 Aug 2018 21:56:58 +0000 (23:56 +0200)]
Armature: Add ghosting support (old x-ray)

2 years agoNon-Meshes: Add ghosting support (old x-ray)
Clément Foucault [Thu, 16 Aug 2018 21:56:33 +0000 (23:56 +0200)]
Non-Meshes: Add ghosting support (old x-ray)

2 years agoFix T56418: Changing to Solid View crashes Blender
Clément Foucault [Thu, 16 Aug 2018 21:55:11 +0000 (23:55 +0200)]
Fix T56418: Changing to Solid View crashes Blender

Everything seems to behave like it should when drawdata is alloced
on instances.

2 years agoOverlay: Fix crash when ghosting is enabled without wireframe
Clément Foucault [Thu, 16 Aug 2018 21:51:15 +0000 (23:51 +0200)]
Overlay: Fix crash when ghosting is enabled without wireframe

2 years agoCleanup: Remove unused uniform and UBO.
Clément Foucault [Thu, 16 Aug 2018 21:39:23 +0000 (23:39 +0200)]
Cleanup: Remove unused uniform and UBO.

2 years agoFix T55722 : Blender 2.8 crashes on startup on old Nvidia cards
Clément Foucault [Thu, 16 Aug 2018 08:59:41 +0000 (10:59 +0200)]
Fix T55722 : Blender 2.8 crashes on startup on old Nvidia cards

2 years agoOverlays: Support for wireframes and edit mode overlay on xray objects
Clément Foucault [Wed, 15 Aug 2018 15:43:39 +0000 (17:43 +0200)]
Overlays: Support for wireframes and edit mode overlay on xray objects

2 years agoGPUFramebuffer: Fix wrong stencil clearing
Clément Foucault [Wed, 15 Aug 2018 15:41:36 +0000 (17:41 +0200)]
GPUFramebuffer: Fix wrong stencil clearing

2 years agobuild_environment: openimageio 1.8.13
Ray Molenkamp [Thu, 16 Aug 2018 19:43:23 +0000 (13:43 -0600)]
build_environment: openimageio 1.8.13

2 years agobuild_environment_windows: fix missing x64 ssl libs and debug build.
Ray Molenkamp [Thu, 16 Aug 2018 15:07:13 +0000 (09:07 -0600)]
build_environment_windows: fix missing x64 ssl libs and debug build.

2 years agobuild_environment: python packages update.
Ray Molenkamp [Thu, 16 Aug 2018 15:06:02 +0000 (09:06 -0600)]
build_environment: python packages update.

idna 2.7
chardet 3.0.4
urllib3 1.23
certifi 2018.8.13
requests 2.19.1

2 years agoBuild Environment: fix OpenVDB 5.1 build on Linux.
Brecht Van Lommel [Thu, 16 Aug 2018 12:39:05 +0000 (14:39 +0200)]
Build Environment: fix OpenVDB 5.1 build on Linux.

2 years agoBuild Environment: fix for IlmBase lib names without version on Linux.
Brecht Van Lommel [Thu, 16 Aug 2018 10:20:05 +0000 (12:20 +0200)]
Build Environment: fix for IlmBase lib names without version on Linux.

2 years agoCorrect error in docstring
Campbell Barton [Thu, 16 Aug 2018 14:07:00 +0000 (00:07 +1000)]
Correct error in docstring

2 years agoDocumentation: fixes for building w/ 2.8
Campbell Barton [Thu, 16 Aug 2018 14:00:58 +0000 (00:00 +1000)]
Documentation: fixes for building w/ 2.8

Note, bpy.app.icons needs to be supported eventually.

2 years agoBuild Environment: cleanup OpenColorIO duplicated and unused flags.
Brecht Van Lommel [Thu, 16 Aug 2018 10:21:51 +0000 (12:21 +0200)]
Build Environment: cleanup OpenColorIO duplicated and unused flags.

2 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Thu, 16 Aug 2018 13:49:33 +0000 (15:49 +0200)]
Merge branch 'master' into blender2.8

2 years agoFix T56404: Shape keys of the curves with multiple splines go haywire in edit mode.
Bastien Montagne [Thu, 16 Aug 2018 13:46:40 +0000 (15:46 +0200)]
Fix T56404: Shape keys of the curves with multiple splines go haywire in edit mode.

Very dummy mistake (someone forgot to increment one of the variables in
one of the loops in that spaghetti nightmare that is nurbs shapekey
code), took half an age to spot it... :/

2 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Thu, 16 Aug 2018 13:22:34 +0000 (15:22 +0200)]
Merge branch 'master' into blender2.8

2 years agobuild_environment: Fix compilation of FFmpeg and OpenColorIO on Linux
Sergey Sharybin [Thu, 16 Aug 2018 13:18:02 +0000 (15:18 +0200)]
build_environment: Fix compilation of FFmpeg and OpenColorIO on Linux

2 years agoCleanup: Use dedicated function to copy mesh during evaluation process
Sergey Sharybin [Thu, 16 Aug 2018 12:20:36 +0000 (14:20 +0200)]
Cleanup: Use dedicated function to copy mesh during evaluation process

It is rather fully annoying to have same sets of obscure flags all over.

2 years agoMultires: Implement function to get mesh at multires position of stack
Sergey Sharybin [Thu, 16 Aug 2018 11:00:24 +0000 (13:00 +0200)]
Multires: Implement function to get mesh at multires position of stack

2 years agoMultires: Cleanup, naming and bool type
Sergey Sharybin [Thu, 16 Aug 2018 10:47:22 +0000 (12:47 +0200)]
Multires: Cleanup, naming and bool type

2 years agoUI: add redo panel to clip editor
Campbell Barton [Thu, 16 Aug 2018 10:23:15 +0000 (20:23 +1000)]
UI: add redo panel to clip editor

2 years agoGP: Add new presets for materials
Antonioya [Thu, 16 Aug 2018 09:24:28 +0000 (11:24 +0200)]
GP: Add new presets for materials

This allow create prests without import materials and include a requested predefined settings for Stroke only, Fill only and Stroke and Fill.

2 years agoStatic Override: fix part of the issues with new Collections.
Bastien Montagne [Thu, 16 Aug 2018 09:05:26 +0000 (11:05 +0200)]
Static Override: fix part of the issues with new Collections.

Still a lot to work here, those are much more complicated to handle than
old Groups. :(

2 years agoCursor Tool: add transform orientation type
Campbell Barton [Thu, 16 Aug 2018 06:14:03 +0000 (16:14 +1000)]
Cursor Tool: add transform orientation type

Support using the current transform orientation when placing the cursor.

See: T55036

2 years agobuild_environment: openvdb 5.1.0
Ray Molenkamp [Thu, 16 Aug 2018 02:47:44 +0000 (20:47 -0600)]
build_environment: openvdb 5.1.0

2 years ago3D View: tweaks to navigation gizmo
Campbell Barton [Thu, 16 Aug 2018 02:47:24 +0000 (12:47 +1000)]
3D View: tweaks to navigation gizmo

- Only show axis backdrop when hovering.
- Move closer to the screen corner.

2 years agoUI: move region toggle closer to the screen edge
Campbell Barton [Thu, 16 Aug 2018 02:43:30 +0000 (12:43 +1000)]
UI: move region toggle closer to the screen edge

Reduces 3d view navigation widget overlap.

2 years agoUI: show +/- icons for fill/deep
Campbell Barton [Thu, 16 Aug 2018 02:15:04 +0000 (12:15 +1000)]
UI: show +/- icons for fill/deep

2 years agoUI: hide redo panel for move up/down operators
Campbell Barton [Wed, 15 Aug 2018 22:41:02 +0000 (08:41 +1000)]
UI: hide redo panel for move up/down operators

2 years agoCamera Background: don't show "Not Set" when using Camera Clip
Dalai Felinto [Wed, 15 Aug 2018 20:08:40 +0000 (17:08 -0300)]
Camera Background: don't show "Not Set" when using Camera Clip

2 years agoCamera Reconstruction: Fix sorted scripts
Dalai Felinto [Wed, 15 Aug 2018 19:10:09 +0000 (16:10 -0300)]
Camera Reconstruction: Fix sorted scripts

* 3D Markers to Mesh
* Link Empty to Track
* Set as Background

Note, the "Setup Tracking Scene" was not addressed. Pending for this script is:
* Update world for EEVEE settings
* Adjust the layer code to use collections
* Remove broken world API

2 years agoCamera Reconstruction: Camera Path
Dalai Felinto [Wed, 15 Aug 2018 15:22:29 +0000 (12:22 -0300)]
Camera Reconstruction: Camera Path

The only difference from 2.7x is that we were using glLineWidth(2.0) before,
which is not supported reliably in the latest OpenGL.

Big thanks to Clément Foucault for helping with this, on the design as well as
debugging the implementation.

For the records, I'm creating and destroying batches for the path geometry at
every draw. The pipeline is as follows:

 1. Create GPUBatch with all the points
 2. Create new shgroup with simple shader
 3. Add call with the gpubatch
 4. Save it in a linked list in stl->g_data
 5. Free it after all drawing is done

2 years agoCamera Reconstruction: Draw solid spheres
Dalai Felinto [Wed, 15 Aug 2018 22:05:20 +0000 (19:05 -0300)]
Camera Reconstruction: Draw solid spheres

If in SOLID "mode", and x-ray, draw the empty spheres still.

2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 15 Aug 2018 22:18:52 +0000 (08:18 +1000)]
Merge branch 'master' into blender2.8

2 years agoCleanup: unused arg
Campbell Barton [Wed, 15 Aug 2018 22:18:25 +0000 (08:18 +1000)]
Cleanup: unused arg

2 years agoCorrect flag use in recent object select change
Campbell Barton [Wed, 15 Aug 2018 22:17:26 +0000 (08:17 +1000)]
Correct flag use in recent object select change

Confusingly it worked, but was wrong.