3 years agoUI: add 3D view check for grease pencil tool
Campbell Barton [Wed, 1 Aug 2018 06:04:21 +0000 (16:04 +1000)]
UI: add 3D view check for grease pencil tool

3 years agoRNA: add space_type to tool
Campbell Barton [Wed, 1 Aug 2018 06:02:20 +0000 (16:02 +1000)]
RNA: add space_type to tool

3 years agoUI: correct grease pencil placement text
Campbell Barton [Wed, 1 Aug 2018 02:24:32 +0000 (12:24 +1000)]
UI: correct grease pencil placement text

3 years agoKeymap: use Q key for quick menu in gpencil mode
Campbell Barton [Wed, 1 Aug 2018 02:19:46 +0000 (12:19 +1000)]
Keymap: use Q key for quick menu in gpencil mode

Note, the keys for changing line display are now more obscure
(Shift-Q, Shift-Alt-Q), and might be changed.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 23:01:29 +0000 (09:01 +1000)]
Merge branch 'master' into blender2.8

3 years agoCleanup: declare vars or make static
Campbell Barton [Tue, 31 Jul 2018 22:57:31 +0000 (08:57 +1000)]
Cleanup: declare vars or make static

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 22:42:00 +0000 (08:42 +1000)]
Merge branch 'master' into blender2.8

Move 'View3D.flag3' options into 'gp_flag'.

3 years agoDNA: remove View3D.flag3
Campbell Barton [Tue, 31 Jul 2018 22:08:59 +0000 (08:08 +1000)]
DNA: remove View3D.flag3

Having 'flag, flag2, flag3' is getting out of hand especially
when we support increasing the size of types.

Make flag2 into an int.

Note, this looses the 'show world' option,
but it's not such an important setting.

3 years agoFix T56181: Annotations hide proportionnal editing UI buttons
Antonioya [Tue, 31 Jul 2018 20:27:13 +0000 (22:27 +0200)]
Fix T56181: Annotations hide proportionnal editing UI buttons

3 years agoKnifeTool: Use GPUBatch API instead of IMM to fix buffer overflow issue
Clément Foucault [Tue, 31 Jul 2018 18:10:14 +0000 (20:10 +0200)]
KnifeTool: Use GPUBatch API instead of IMM to fix buffer overflow issue

This also include a small optimisation (remove of a double loop and half of
the memory allocation for hit points)

This should fix T55946 Crash using knife tool on mesh with large number of

Tried with a 500K vert suzanne and it seems fine.

3 years agoRevert "Gitignore: Ignore diffs in all subdirs"
Aaron Carlisle [Tue, 31 Jul 2018 17:03:48 +0000 (13:03 -0400)]
Revert "Gitignore: Ignore diffs in all subdirs"

This is an issue for some file in the extern dir

This reverts commit d940a081a9f1f4106a5d2d155682695b0a6b0cb6.

3 years agoGitignore: Ignore diffs in all subdirs
Aaron Carlisle [Tue, 26 Jun 2018 17:53:54 +0000 (13:53 -0400)]
Gitignore: Ignore diffs in all subdirs

3 years agoFix crash when rendering viewport within another area
Clément Foucault [Tue, 31 Jul 2018 16:20:57 +0000 (18:20 +0200)]
Fix crash when rendering viewport within another area

This also Fix T55574 Crash on sequencer preview

3 years agoGPUFrameBuffer: Put active framebuffer in GPUContext
Clément Foucault [Tue, 31 Jul 2018 16:16:08 +0000 (18:16 +0200)]
GPUFrameBuffer: Put active framebuffer in GPUContext

instead of being ThreadLocal and leading to incorrect usage.

We still enforce no framebuffer when changing context. We can lift this
restriction later.

3 years agoGPU: Replace malloc/calloc/realloc/free with MEM_* counterpart
Clément Foucault [Tue, 31 Jul 2018 14:54:58 +0000 (16:54 +0200)]
GPU: Replace malloc/calloc/realloc/free with MEM_* counterpart

3 years agoFix set_pixel overflow in fill brush
Antonioya [Tue, 31 Jul 2018 15:02:50 +0000 (17:02 +0200)]
Fix set_pixel overflow in fill brush

The value of the index was above the size of image

3 years agoFix: Motion Paths were still visible after clearing them
Joshua Leung [Tue, 31 Jul 2018 13:27:47 +0000 (01:27 +1200)]
Fix: Motion Paths were still visible after clearing them

After clearing motion paths from objects, those objects needed to be
tagged for copy on write so that the copied data (i.e. viewport)
recieve the changes (i.e. removed paths)

Reported by Hjalti

3 years agoUI: Grease Pencil Simplify tweaks
Pablo Vazquez [Tue, 31 Jul 2018 14:14:05 +0000 (16:14 +0200)]
UI: Grease Pencil Simplify tweaks

Single-column layout and tweaks to tooltips.

3 years agoChange Brush smooth factor to 0.1 by default
Antonioya [Tue, 31 Jul 2018 14:04:57 +0000 (16:04 +0200)]
Change Brush smooth factor to 0.1 by default

The old values were too high.

3 years agoSet overlay default values
Antonioya [Tue, 31 Jul 2018 13:57:11 +0000 (15:57 +0200)]
Set overlay default values

3 years agoEnable ghost onion skin by default
Antonioya [Tue, 31 Jul 2018 13:38:45 +0000 (15:38 +0200)]
Enable ghost onion skin by default

This option was changed by error when implement annotations.

3 years agoFix grease pencil line toggle
Campbell Barton [Tue, 31 Jul 2018 13:36:01 +0000 (23:36 +1000)]
Fix grease pencil line toggle

Replace with generic context toggle operator.

3 years agoFix T55718: Blender 2.8 crashes when converting to Curve from Mesh.
Bastien Montagne [Tue, 31 Jul 2018 13:29:51 +0000 (15:29 +0200)]
Fix T55718: Blender 2.8 crashes when converting to Curve from Mesh.

We only want to care about runtime.mesh_orig if… data is indeed a Mesh! ;)

3 years agoUI: Grease Pencil Onion Skin minor tweaks
Pablo Vazquez [Tue, 31 Jul 2018 13:13:08 +0000 (15:13 +0200)]
UI: Grease Pencil Onion Skin minor tweaks

Avoid double label for same properties in single-column.
Onion Skinning: Group custom colors together, and frame before/after together.

Small changes to tooltips.

3 years agoUI: remove grease pencil settings from topbar
Campbell Barton [Tue, 31 Jul 2018 13:00:17 +0000 (23:00 +1000)]
UI: remove grease pencil settings from topbar

Top bar is only for settings that apply to the next action
not a way to change existing data.

If each stroke could have a different color this would work as expected,
however it was adjusting the current layer color.

3 years agoFix cmake external library build for blosc/freetype on some systems.
Brecht Van Lommel [Tue, 31 Jul 2018 12:22:32 +0000 (14:22 +0200)]
Fix cmake external library build for blosc/freetype on some systems.

3 years agoUI: Metadata panel tweaks
Pablo Vazquez [Tue, 31 Jul 2018 12:31:34 +0000 (14:31 +0200)]
UI: Metadata panel tweaks

Rename "Seq. Strip" to Strip Name, "Sequence Strip" to Use Strip Metadata.
Plus re-arrange of properties and separators for sections.

Thanks @fsiddi for the feedback.

3 years agoFix (unreported) wrong logic in gpencil UI code.
Bastien Montagne [Tue, 31 Jul 2018 11:37:23 +0000 (13:37 +0200)]
Fix (unreported) wrong logic in gpencil UI code.

3 years agoCleanup: pep8, windows line endings
Campbell Barton [Tue, 31 Jul 2018 11:06:08 +0000 (21:06 +1000)]
Cleanup: pep8, windows line endings

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 11:27:51 +0000 (21:27 +1000)]
Merge branch 'master' into blender2.8

3 years agoFix T56170: Fake dependency cycle in new depsgraph + interleaved armature update...
Sergey Sharybin [Tue, 31 Jul 2018 11:23:01 +0000 (13:23 +0200)]
Fix T56170: Fake dependency cycle in new depsgraph + interleaved armature update + proxy

Make proxy copy result more atomic operation.

3 years agoFix memory leak in DRW_cache_gpencil_axes_get
Antonioya [Tue, 31 Jul 2018 11:21:04 +0000 (13:21 +0200)]
Fix memory leak in DRW_cache_gpencil_axes_get

The Batch was created using old function without  GPU_BATCH_OWNS_VBO and the batch was not removed from memory

3 years agoUI: Annotations tool color setting in toolbar
Pablo Vazquez [Tue, 31 Jul 2018 11:08:30 +0000 (13:08 +0200)]
UI: Annotations tool color setting in toolbar

3 years agoFix building w/ FreeBSD
Campbell Barton [Tue, 31 Jul 2018 10:52:36 +0000 (20:52 +1000)]
Fix building w/ FreeBSD

fileno could be a macro which can't take a void pointer.

3 years agoUI: Annotations panel tweak
Pablo Vazquez [Tue, 31 Jul 2018 10:46:50 +0000 (12:46 +0200)]
UI: Annotations panel tweak

"New Note" and "New" datablock do the same, only show one.
Minor code comments cleanup.

3 years agoCleanup: use static variables
Campbell Barton [Tue, 31 Jul 2018 10:44:49 +0000 (20:44 +1000)]
Cleanup: use static variables

3 years agoCleanup: Fix weird comparisons
Antonioya [Tue, 31 Jul 2018 10:44:01 +0000 (12:44 +0200)]
Cleanup: Fix weird comparisons

3 years agoCleanup: Remove overflow array element
Antonioya [Tue, 31 Jul 2018 10:38:44 +0000 (12:38 +0200)]
Cleanup: Remove overflow array element

3 years agoFix assert when load file with shading enabled
Antonioya [Tue, 31 Jul 2018 10:37:58 +0000 (12:37 +0200)]
Fix assert when load file with shading enabled

Credits for this fix goes to Clément Foucault.

3 years agoUI: Collapse Annotations panel by default
Pablo Vazquez [Tue, 31 Jul 2018 10:26:06 +0000 (12:26 +0200)]
UI: Collapse Annotations panel by default

3 years agoCleanup: style, duplicate includes
Campbell Barton [Tue, 31 Jul 2018 10:11:55 +0000 (20:11 +1000)]
Cleanup: style, duplicate includes

3 years agoFix crash opening .blend files with palettes.
Brecht Van Lommel [Tue, 31 Jul 2018 09:45:15 +0000 (11:45 +0200)]
Fix crash opening .blend files with palettes.

Palettes were incorrectly set as having animation data.

3 years agoCleanup: fix compiler warnings.
Brecht Van Lommel [Tue, 31 Jul 2018 09:30:24 +0000 (11:30 +0200)]
Cleanup: fix compiler warnings.

3 years agoRespect ID user count when creating pose on object copy
Sergey Sharybin [Tue, 31 Jul 2018 09:38:10 +0000 (11:38 +0200)]
Respect ID user count when creating pose on object copy

This solves wrong user counter of custom shape when duplicating bone
few times and then undoing all the duplications.

3 years agoDepsgraph: Fix crash on undo of new bone added
Sergey Sharybin [Tue, 31 Jul 2018 09:32:38 +0000 (11:32 +0200)]
Depsgraph: Fix crash on undo of new bone added

Pose is not brought up to date for until exit of edit mode,
so can not use.

3 years agoCleanup: style
Campbell Barton [Tue, 31 Jul 2018 09:21:04 +0000 (19:21 +1000)]
Cleanup: style

3 years agoSubsurf: Disable oprtion for now
Sergey Sharybin [Tue, 31 Jul 2018 09:17:51 +0000 (11:17 +0200)]
Subsurf: Disable oprtion for now

Committed by accident, is too early for this yet.

3 years agoCleanup: trailing space
Campbell Barton [Tue, 31 Jul 2018 09:07:56 +0000 (19:07 +1000)]
Cleanup: trailing space

3 years agoNew Grease Pencil object for 2D animation
Antonioya [Tue, 31 Jul 2018 08:22:19 +0000 (10:22 +0200)]
New Grease Pencil object for 2D animation

This commit merge the full development done in greasepencil-object branch and include mainly the following features.

- New grease pencil object.
- New drawing engine.
- New grease pencil modes Draw/Sculpt/Edit and Weight Paint.
- New brushes for grease pencil.
- New modifiers for grease pencil.
- New shaders FX.
- New material system (replace old palettes and colors).
- Split of annotations (old grease pencil) and new grease pencil object.
- UI adapted to blender 2.8.

You can get more info here:

This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible.

Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 08:43:37 +0000 (18:43 +1000)]
Merge branch 'master' into blender2.8

3 years agoFix Shape Key retime starting at frame 10
Campbell Barton [Tue, 31 Jul 2018 08:42:22 +0000 (18:42 +1000)]
Fix Shape Key retime starting at frame 10

D3571 by @alm

3 years agoWorkbench: Correct ifndef after recent changes
Sergey Sharybin [Tue, 31 Jul 2018 08:25:54 +0000 (10:25 +0200)]
Workbench: Correct ifndef after recent changes

Usage of matcap image uniform had different ifdef than definition
of that uniform. Assuming the usage was correct, and the definition
needed an update.

Prevents shader from compilation failure and from aborts in debug

3 years agoSubsurf: Rework in a way that patches boundaries are merged together
Sergey Sharybin [Wed, 25 Jul 2018 14:51:48 +0000 (16:51 +0200)]
Subsurf: Rework in a way that patches boundaries are merged together

The idea is to create vertices along the coarse edges once, without
splitting coarse edges on separate ptex faces. This requires some
indexing magic, vertices within a patch are no longer sequential.

Not sure how to make it nicer without such a black magic looking
calculations (which are basically boiling down to mimicking order
of verts/edges creation).

In the current offsets calculation loose verts and edges are not
properly taken into account, but those are causing topology refiner
to fail anyway, so it needs a bit deeper change.

Reviewers: brecht

Differential Revision:

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 07:03:28 +0000 (17:03 +1000)]
Merge branch 'master' into blender2.8

3 years agoBLF: replace global aa pref w/ monochrome flag
Campbell Barton [Tue, 31 Jul 2018 06:57:05 +0000 (16:57 +1000)]
BLF: replace global aa pref w/ monochrome flag

Now disabling anti-aliasing doesn't impact sequencer, render stamp etc.

3 years agoFix crash w/ missing matcaps
Campbell Barton [Tue, 31 Jul 2018 06:44:35 +0000 (16:44 +1000)]
Fix crash w/ missing matcaps

Building w/o EXR caused this.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 06:24:12 +0000 (16:24 +1000)]
Merge branch 'master' into blender2.8

3 years agoUI: use text hinting (now user preference)
Campbell Barton [Tue, 31 Jul 2018 06:05:31 +0000 (16:05 +1000)]
UI: use text hinting (now user preference)

D3201 by @ambient w/ edits not to impact fonts used for rendering
(only change display for UI text).

3 years agoUI: consistent names for edit-mode overlay
Campbell Barton [Tue, 31 Jul 2018 02:59:48 +0000 (12:59 +1000)]
UI: consistent names for edit-mode overlay

3 years agoFix T56155: Header shows in popover context menu
Campbell Barton [Tue, 31 Jul 2018 00:45:35 +0000 (10:45 +1000)]
Fix T56155: Header shows in popover context menu

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 31 Jul 2018 00:42:19 +0000 (10:42 +1000)]
Merge branch 'master' into blender2.8

3 years agoUI: add check for any kind of popup
Campbell Barton [Tue, 31 Jul 2018 00:37:46 +0000 (10:37 +1000)]
UI: add check for any kind of popup

Fixes T56155 when merging into 2.8

3 years agoFix build error in new build after recent merge.
Brecht Van Lommel [Mon, 30 Jul 2018 21:01:20 +0000 (23:01 +0200)]
Fix build error in new build after recent merge.

3 years agoViewport: use Filmic without scene exposure/gamma/curves for workbench.
Brecht Van Lommel [Mon, 30 Jul 2018 13:44:25 +0000 (15:44 +0200)]
Viewport: use Filmic without scene exposure/gamma/curves for workbench.

This ignores the scene color managment view settings for solid mode and
lookdev when not using scene lights and world. The scene settings are
intended for tweaking renders and should not affect studio lighting and

There may be cases where a simple sRGB transform is better than Filmic
and we could add configuration for this. Not sure if it really matters
and it may be better if we just assume matcaps and studiolights are all
created for one view transform.

Differential Revision:

3 years agoMerge branch 'master' into blender2.8
Brecht Van Lommel [Mon, 30 Jul 2018 16:38:27 +0000 (18:38 +0200)]
Merge branch 'master' into blender2.8

3 years agoUI: make horizontal wheel scroll in 2D view match vertical scroll speed.
Brecht Van Lommel [Mon, 30 Jul 2018 16:25:01 +0000 (18:25 +0200)]
UI: make horizontal wheel scroll in 2D view match vertical scroll speed.

3 years agoClean Keyframes operator tweaks
Joshua Leung [Mon, 30 Jul 2018 15:48:37 +0000 (03:48 +1200)]
Clean Keyframes operator tweaks

By popular demand, the CLean Keyframes operator will now
leave handles and other interpolation settings untouched.

Previously, it would recreate the keyframes from scratch,
keeping only the frame + value, under the assumption that
the handle information was "bad" (i.e. the source of bumps
and roughness, due to bad hand tweaking). However, since
most animators use this on hand-keyed animation instead of
motion-capture data, this assumption didn't hold, and was
actually overly destructive - wiping out lots of hand-adjusted
curve data.

3 years agoMinor cleanup.
Bastien Montagne [Mon, 30 Jul 2018 15:42:28 +0000 (17:42 +0200)]
Minor cleanup.

3 years agoBuild: require C11/C++11 for all operating systems in master.
Brecht Van Lommel [Wed, 25 Jul 2018 14:59:46 +0000 (16:59 +0200)]
Build: require C11/C++11 for all operating systems in 

This is in preparation of upgrading our library dependencies, some of which
need C++11. We already use C++11 in blender2.8 and for Windows and macOS, so
this just affects Linux.

On many distributions this will not require any changes, on some will need to be run again to rebuild libraries.

Differential Revision:

3 years agoSilencing a bunch of compiler warnings
Joshua Leung [Mon, 30 Jul 2018 14:57:53 +0000 (02:57 +1200)]
Silencing a bunch of compiler warnings

Most of these were mismatched const qualifiers

3 years agoCleanup/Refactor: Move CurveCache runtime data into Object.runtime struct.
Bastien Montagne [Mon, 30 Jul 2018 14:54:40 +0000 (16:54 +0200)]
Cleanup/Refactor: Move CurveCache runtime data into Object.runtime struct.

Also, fix missing cleanup of Object.runtime when copying Object

3 years agoWorkbench: Use FXAA instead of TAA when viewport is animated.
Clément Foucault [Mon, 30 Jul 2018 14:48:44 +0000 (16:48 +0200)]
Workbench: Use FXAA instead of TAA when viewport is animated.

Fix T55996 "Playback in "Active Editor Only" doesn't work"

3 years agoCycles: Fixed OpenCL build. sqr(float4) is available on CUDA and CPU, but not on...
Stefan Werner [Mon, 30 Jul 2018 13:42:00 +0000 (15:42 +0200)]
Cycles: Fixed OpenCL build. sqr(float4) is available on CUDA and CPU, but not on OpenCL.

3 years agoFix T56020: Crash while opening .blend file made with older version.
Bastien Montagne [Mon, 30 Jul 2018 13:00:51 +0000 (15:00 +0200)]
Fix T56020: Crash while opening .blend file made with older version.

We need a NULL workspace check here, in some cases we get a SRTemp
screen even though it's not tagged as temp...

3 years agoUI: Hide labels from MatCaps
Pablo Vazquez [Mon, 30 Jul 2018 12:50:44 +0000 (14:50 +0200)]
UI: Hide labels from MatCaps

They were added as placeholder to show something until they lazy-load.
But since the load is fast and it's hard to fit the text, and their name
is displayed already in the tooltip, we can do without for now.

In the future when we have insta-tooltips we should make them use this.

3 years agoMotion Path: Don't blit MSAA buffer if there is no motion paths
Clément Foucault [Mon, 30 Jul 2018 12:18:38 +0000 (14:18 +0200)]
Motion Path: Don't blit MSAA buffer if there is no motion paths

3 years agoArmature: Fix bone always transparent when enabling MSAA
Clément Foucault [Mon, 30 Jul 2018 12:17:53 +0000 (14:17 +0200)]
Armature: Fix bone always transparent when enabling MSAA

3 years agoMotion Path: Fix motion path when MSAA is enabled
Clément Foucault [Mon, 30 Jul 2018 12:15:40 +0000 (14:15 +0200)]
Motion Path: Fix motion path when MSAA is enabled

3 years agoDRW: Add option to only resolve framebuffer colors without depth test
Clément Foucault [Mon, 30 Jul 2018 11:56:22 +0000 (13:56 +0200)]
DRW: Add option to only resolve framebuffer colors without depth test

3 years agoDRW: Add DRW_shgroup_is_empty and DRW_pass_is_empty
Clément Foucault [Mon, 30 Jul 2018 10:23:23 +0000 (12:23 +0200)]
DRW: Add DRW_shgroup_is_empty and DRW_pass_is_empty

3 years agoViewport: add new default set of matcaps.
Brecht Van Lommel [Mon, 30 Jul 2018 11:43:06 +0000 (13:43 +0200)]
Viewport: add new default set of matcaps.

These were made by the community and curated by Pablo and William.
Thanks to everyone who contributed!

Command used for compression:
oiiotool %s --ch R,G,B -d half --compression dwab -o output/%s

3 years agoShape keys: change default interpolation for absolute shape keys to linear.
Brecht Van Lommel [Mon, 30 Jul 2018 10:22:18 +0000 (12:22 +0200)]
Shape keys: change default interpolation for absolute shape keys to linear.

3 years agoFix T56121 and maybe others: DST.gpu_context was being created in the wrong DST.gl_co...
mano-wii [Mon, 30 Jul 2018 11:49:27 +0000 (08:49 -0300)]
Fix T56121 and maybe others: DST.gpu_context was being created in the wrong DST.gl_context.

In addition to the crash in the selection of bones, this was responsible for other problems such as wrong hair and disappearing objects.

3 years agoFix T56152: Rotate crash w/ individual origins
Campbell Barton [Mon, 30 Jul 2018 10:53:34 +0000 (20:53 +1000)]
Fix T56152: Rotate crash w/ individual origins

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 30 Jul 2018 06:51:39 +0000 (16:51 +1000)]
Merge branch 'master' into blender2.8

3 years agoSequencer: move text & color into own category
Campbell Barton [Mon, 30 Jul 2018 06:46:55 +0000 (16:46 +1000)]
Sequencer: move text & color into own category

Add 'Generate' menu, these aren't effects from a user perspective.

D3546 by @rudolf.ortner

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 30 Jul 2018 06:41:28 +0000 (16:41 +1000)]
Merge branch 'master' into blender2.8

3 years agoCleanup: id-property creation
Campbell Barton [Mon, 30 Jul 2018 06:36:07 +0000 (16:36 +1000)]
Cleanup: id-property creation

D3473 by @JacquesLucke

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 30 Jul 2018 06:26:29 +0000 (16:26 +1000)]
Merge branch 'master' into blender2.8

3 years agoUse Ctrl Snap to seconds w/ play-head drag
Campbell Barton [Mon, 30 Jul 2018 06:16:44 +0000 (16:16 +1000)]
Use Ctrl Snap to seconds w/ play-head drag

D3056 by @alourenco

3 years agoCleanup: trailing space
Campbell Barton [Mon, 30 Jul 2018 05:40:09 +0000 (15:40 +1000)]
Cleanup: trailing space

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 30 Jul 2018 05:39:12 +0000 (15:39 +1000)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space
Campbell Barton [Mon, 30 Jul 2018 05:38:39 +0000 (15:38 +1000)]
Cleanup: trailing space

3 years agoCMake: omit superfluous Up-to-date messages
Campbell Barton [Mon, 30 Jul 2018 05:20:34 +0000 (15:20 +1000)]
CMake: omit superfluous Up-to-date messages

Causes a lot of noise when building the install target.

3 years agoUI: Custom FPS not showing properly if editor is narrow
Pablo Vazquez [Sun, 29 Jul 2018 20:49:49 +0000 (22:49 +0200)]
UI: Custom FPS not showing properly if editor is narrow

3 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Ray Molenkamp [Sun, 29 Jul 2018 17:27:01 +0000 (11:27 -0600)]
Merge remote-tracking branch 'origin/master' into blender2.8

3 years agomake.bat : fix msvc 2017 detection.
Ray Molenkamp [Sun, 29 Jul 2018 17:24:49 +0000 (11:24 -0600)]
make.bat : fix msvc 2017 detection.

when 2017 was not found, it did not properly bail out of the rest of the detection process unless verbose mode was used.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 29 Jul 2018 02:12:36 +0000 (12:12 +1000)]
Merge branch 'master' into blender2.8

3 years agoFix T56120: bad property access (from 2.8)
Campbell Barton [Sun, 29 Jul 2018 02:09:00 +0000 (12:09 +1000)]
Fix T56120: bad property access (from 2.8)

Thanks to @brita_ for the fix.

3 years agoUI: correct RNA property
Campbell Barton [Sun, 29 Jul 2018 01:54:12 +0000 (11:54 +1000)]
UI: correct RNA property