blender.git
3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Tue, 19 Jun 2018 14:49:54 +0000 (16:49 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c

3 years ago3D View: improve selection locking
Campbell Barton [Tue, 19 Jun 2018 14:41:18 +0000 (16:41 +0200)]
3D View: improve selection locking

Locked selection would still occlude with objects which could not be
selected.

3 years agoStudiolight: Temp Mutex issue
Jeroen Bakker [Tue, 19 Jun 2018 14:33:47 +0000 (16:33 +0200)]
Studiolight: Temp Mutex issue

This is a temp fix for a better system.
Currently the studiolights can be referenced by a WM_job and being freed
via the API. This can happen when removing a studiolight via the
interface.

As the studiolight has no relation with the job, it is hard to detect if
it is still being used. I tried with a Mutex and a Thread Queue but they
were failing.

So the current temp fix is to keep the studiolights in memory until you
close blender. This Must be fixed ASAP! I added this fix so normal cases
can workish.

3 years agoCycles: Fixed crash when the camera was inside 16 volumes or more. It still won't...
Stefan Werner [Tue, 19 Jun 2018 14:34:15 +0000 (16:34 +0200)]
Cycles: Fixed crash when the camera was inside 16 volumes or more. It still won't render those volumes correctly, but at least the crash is addressed.

3 years agoFix (unreported) passing CDLayer 'ID' instead of bitflag to a cdlayer mask!
Bastien Montagne [Tue, 19 Jun 2018 14:25:24 +0000 (16:25 +0200)]
Fix (unreported) passing CDLayer 'ID' instead of bitflag to a cdlayer mask!

Probably harmless, since I bet CD_ORIGINDEX is nearly always generated,
but still...

3 years agoMerge branch 'master' into blender2.8
Brecht Van Lommel [Tue, 19 Jun 2018 14:21:35 +0000 (16:21 +0200)]
Merge branch 'master' into blender2.8

3 years agoFix missing render slots bugs after recent changes.
Brecht Van Lommel [Tue, 19 Jun 2018 14:07:10 +0000 (16:07 +0200)]
Fix missing render slots bugs after recent changes.

3 years agoCorrect rigidbody stub
Campbell Barton [Tue, 19 Jun 2018 14:18:23 +0000 (16:18 +0200)]
Correct rigidbody stub

3 years agoFix animation player
Campbell Barton [Tue, 19 Jun 2018 14:13:10 +0000 (16:13 +0200)]
Fix animation player

3 years agoUI: Smoke panels as sub-panels
Pablo Vazquez [Tue, 19 Jun 2018 14:01:29 +0000 (16:01 +0200)]
UI: Smoke panels as sub-panels

Remove suffix from name since they are sub-panels now.

Display Settings -> Viewport Display, and two sub-panels as well for less used settings.

3 years agoCleanup: remove ref to dm in names in projpaint struct.
Bastien Montagne [Tue, 19 Jun 2018 13:53:21 +0000 (15:53 +0200)]
Cleanup: remove ref to dm in names in projpaint struct.

3 years agoRemove derivedmesh from 3DView texture/projection paint.
Bastien Montagne [Tue, 19 Jun 2018 13:47:54 +0000 (15:47 +0200)]
Remove derivedmesh from 3DView texture/projection paint.

Pretty straightforward changes. Name cleanup to follow in a separated
commit.

3 years agoUI: Fluid physics panels as sub-panels
Pablo Vazquez [Tue, 19 Jun 2018 13:47:11 +0000 (15:47 +0200)]
UI: Fluid physics panels as sub-panels

Also remove suffix from name since they are sub-panels now.

3 years agoUI: Soft Body panels as sub-panels
Pablo Vazquez [Tue, 19 Jun 2018 13:41:59 +0000 (15:41 +0200)]
UI: Soft Body panels as sub-panels

Also remove suffix from name since they are sub-panels now.

3 years agoUI: Rigid body panels as sub-panels
Pablo Vazquez [Tue, 19 Jun 2018 13:38:51 +0000 (15:38 +0200)]
UI: Rigid body panels as sub-panels

Also remove suffix from name since they are sub-panels now.

3 years agoRemove rigid body from rbw->group when deleting
Sybren A. Stüvel [Tue, 19 Jun 2018 12:57:07 +0000 (14:57 +0200)]
Remove rigid body from rbw->group when deleting

I moved some code from ED_rigidbody_object_remove() to
BKE_rigidbody_remove_object(), so that calling the latter doesn't leave
the object in rbw->group (causing a crash later on when rebuilding the
depsgraph).

3 years agoUI: Cloth panels as sub-panels
Pablo Vazquez [Tue, 19 Jun 2018 13:33:32 +0000 (15:33 +0200)]
UI: Cloth panels as sub-panels

Also remove Cloth suffix from name since they are sub-panels now.

3 years agoParticles: Support changing modifiers during particle edit mode
Sergey Sharybin [Tue, 19 Jun 2018 13:25:48 +0000 (15:25 +0200)]
Particles: Support changing modifiers during particle edit mode

The idea is to only use pointers to particles in original object when
creating an edit structure. The derived mesh we get from evaluated
object.

The rest of the commit is just keeping pointers in sync.

3 years agoParticles: Use utility function to copy particles
Sergey Sharybin [Tue, 19 Jun 2018 09:46:39 +0000 (11:46 +0200)]
Particles: Use utility function to copy particles

3 years agoParticles: Add utility function to copy particles from one system to another
Sergey Sharybin [Tue, 19 Jun 2018 09:40:09 +0000 (11:40 +0200)]
Particles: Add utility function to copy particles from one system to another

3 years agoBlender Version Bump
Campbell Barton [Tue, 19 Jun 2018 12:49:26 +0000 (14:49 +0200)]
Blender Version Bump

Without this, render slots aren't added.

3 years agoRevert: EditMode Inactive edge drawing
Jeroen Bakker [Tue, 19 Jun 2018 12:32:09 +0000 (14:32 +0200)]
Revert: EditMode Inactive edge drawing

Did it manually as there was some refactoring done that has value

3 years agoFixed rigid body simulation randomly stopping
Sybren A. Stüvel [Tue, 19 Jun 2018 10:16:18 +0000 (12:16 +0200)]
Fixed rigid body simulation randomly stopping

This was caused by a floating point comparison using ==, instead of using
compare_ff_relative().

3 years agoMissed warning in previous commit
Jeroen Bakker [Tue, 19 Jun 2018 12:07:21 +0000 (14:07 +0200)]
Missed warning in previous commit

3 years agoLookdev: Renamed RNA
Jeroen Bakker [Tue, 19 Jun 2018 12:03:53 +0000 (14:03 +0200)]
Lookdev: Renamed RNA

studiolight_background => studiolight_background_alpha
Removed "Show" from the label

3 years agoStudiolight: Background Generation of icons
Jeroen Bakker [Tue, 19 Jun 2018 12:00:34 +0000 (14:00 +0200)]
Studiolight: Background Generation of icons

3 years agoShow cached frames in timeline at correct height
Sybren A. Stüvel [Tue, 19 Jun 2018 09:49:19 +0000 (11:49 +0200)]
Show cached frames in timeline at correct height

The line was covered by the horizontal scrollbar instead of drawn above
it.

3 years agoRigidBodyWorld: copy ptcache from evaluated scene back to original scene
Sybren A. Stüvel [Tue, 19 Jun 2018 09:33:48 +0000 (11:33 +0200)]
RigidBodyWorld: copy ptcache from evaluated scene back to original scene

This makes it possible to perform re-evaluation of the scene without
having to re-run the simulation.

The CoW → Orig copy is only performed when the depsgraph is active, so
as to not influence the current scene while rendering in the background.

Alternatively, we could have the CoW copy share the cache with the
original to prevent too much copying of cache data. This will be faster,
but I'm not sure whether we can reliably check the DEG_is_active()
status at CoW copy creation time.

3 years agoFix T55528: Cycles AO node should default to 1 if radius is 0.
Brecht Van Lommel [Tue, 19 Jun 2018 09:44:23 +0000 (11:44 +0200)]
Fix T55528: Cycles AO node should default to 1 if radius is 0.

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Tue, 19 Jun 2018 08:52:01 +0000 (10:52 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c

3 years agoCleanup DM generation code for ProjPaint.
Bastien Montagne [Tue, 19 Jun 2018 08:48:37 +0000 (10:48 +0200)]
Cleanup DM generation code for ProjPaint.

Two branches were actually doing essentially the same thing here, no
need to artificially complicate things. ;)

3 years agoFix (unreported) unauthorized relesing of derived_final DM in paint projection code.
Bastien Montagne [Tue, 19 Jun 2018 08:43:54 +0000 (10:43 +0200)]
Fix (unreported) unauthorized relesing of derived_final DM in paint projection code.

NEVER free yourself DM returned by mesh_get_derived_final(), it's always
to one assigned to ob->derived_final!

3 years agoCleanup: rename mode -> object.mode in Py UI
Campbell Barton [Tue, 19 Jun 2018 07:25:05 +0000 (09:25 +0200)]
Cleanup: rename mode -> object.mode in Py UI

Keep 'mode' only for 'context.mode'.

3 years agoError in last commit
Campbell Barton [Tue, 19 Jun 2018 07:20:38 +0000 (09:20 +0200)]
Error in last commit

3 years agoUI: move object-mode lock out of the 3D header
Campbell Barton [Tue, 19 Jun 2018 07:11:03 +0000 (09:11 +0200)]
UI: move object-mode lock out of the 3D header

Avoid obscure options here.
Move to the edit menu, although this may be temporary.

3 years agoStudiolight: Add SH2 cache
Jeroen Bakker [Tue, 19 Jun 2018 06:48:01 +0000 (08:48 +0200)]
Studiolight: Add SH2 cache

- the result of the SH2-coeffiecients are stored in a bin file (3*9
floats). As the file is a local file we do not care about the
architecture.
- solved issue that also for internal lights the irradiance file were
stored. We don't want that as it could be in a not accessible location

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 19 Jun 2018 06:56:45 +0000 (08:56 +0200)]
Merge branch 'master' into blender2.8

3 years agoVertex Paint: set sculpt object mode immediately
Campbell Barton [Tue, 19 Jun 2018 06:35:41 +0000 (08:35 +0200)]
Vertex Paint: set sculpt object mode immediately

SculptSession.mode_type wasn't initialized until painting,
making it unreliable for checks in other parts of the code.

Also remove unnecessary initialization,
matching sculpt mode more closely.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 19 Jun 2018 06:15:03 +0000 (08:15 +0200)]
Merge branch 'master' into blender2.8

3 years agoeditorconfig: correct C/C++ using space
Campbell Barton [Tue, 19 Jun 2018 05:48:12 +0000 (07:48 +0200)]
editorconfig: correct C/C++ using space

3 years agoGhost: Fix offline OGL render on windows.
Ray Molenkamp [Tue, 19 Jun 2018 00:10:45 +0000 (18:10 -0600)]
Ghost: Fix offline OGL render on windows.

rBe0c088f8fb5a introduced offline rendering support on windows, sadly it was trying to use the desktop window for getting a context, which given SetPixelFormat can only be called once for any given HDC was an unfortunate choice.

This patch uses a temporary hidden window for getting the opengl context.

Reviewers: mano-wii

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

3 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Ray Molenkamp [Mon, 18 Jun 2018 19:40:39 +0000 (13:40 -0600)]
Merge remote-tracking branch 'origin/master' into blender2.8

3 years agomake.bat: Fix msvc-2017 detection.
Ray Molenkamp [Mon, 18 Jun 2018 19:39:12 +0000 (13:39 -0600)]
make.bat: Fix msvc-2017 detection.

D3485 by @manung

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

3 years agoCleanup: code-style
Campbell Barton [Mon, 18 Jun 2018 18:58:08 +0000 (20:58 +0200)]
Cleanup: code-style

3 years agoObject Mode: make mode locking optional
Campbell Barton [Mon, 18 Jun 2018 18:40:41 +0000 (20:40 +0200)]
Object Mode: make mode locking optional

Design from T55246 is kept while allowing 2.7x behavior.

3 years agoFix a very nasty and sneaky bug in lib remap / static override code.
Bastien Montagne [Mon, 18 Jun 2018 18:17:44 +0000 (20:17 +0200)]
Fix a very nasty and sneaky bug in lib remap / static override code.

Not sure why remap call for static override reference ID pointer was put
there, probably a mistake during some merge back in the days...

But this ended up with self_id of libquery data struct still being set
to previous ID pointer, which could randomly generate crap like falsly
reporting indirect data and such, leading to lost reference datablock at
writefile time...

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 16:55:12 +0000 (18:55 +0200)]
Merge branch 'master' into blender2.8

3 years agoeditorconfig: add rst
Campbell Barton [Mon, 18 Jun 2018 16:53:49 +0000 (18:53 +0200)]
editorconfig: add rst

3 years agoCleanup: use DEG tag flags, instead of old OB ones.
Bastien Montagne [Mon, 18 Jun 2018 16:42:42 +0000 (18:42 +0200)]
Cleanup: use DEG tag flags, instead of old OB ones.

Having those two in parallel is ratehr confusing... :/

3 years agoFix crash when making static override of an object from a collection.
Bastien Montagne [Mon, 18 Jun 2018 16:40:54 +0000 (18:40 +0200)]
Fix crash when making static override of an object from a collection.

Since we free collection caches when we remap one of their objects, we
also need to tell depsgraph to flush this into the COWs of that
collection, otherwise things like draw code can access freed memory...

3 years ago3D View: don't show manipulators when overlay is disabled
Campbell Barton [Mon, 18 Jun 2018 16:33:02 +0000 (18:33 +0200)]
3D View: don't show manipulators when overlay is disabled

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 16:22:06 +0000 (18:22 +0200)]
Merge branch 'master' into blender2.8

3 years agoeditorconfig: add line length, glsl
Campbell Barton [Mon, 18 Jun 2018 16:21:35 +0000 (18:21 +0200)]
editorconfig: add line length, glsl

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 16:12:04 +0000 (18:12 +0200)]
Merge branch 'master' into blender2.8

3 years agoAdd .editorconfig file
Campbell Barton [Mon, 18 Jun 2018 16:09:45 +0000 (18:09 +0200)]
Add .editorconfig file

This is a fairly well supported file-type configuration
for indentation and trailing space stripping.

See editorconfig.org for details.

3 years agoAvoid assert on startup
Campbell Barton [Mon, 18 Jun 2018 15:39:35 +0000 (17:39 +0200)]
Avoid assert on startup

3 years agoCleanup: redundant greater than
Campbell Barton [Mon, 18 Jun 2018 15:39:19 +0000 (17:39 +0200)]
Cleanup: redundant greater than

3 years agoParticle: Add missing field initializaiton
Sergey Sharybin [Mon, 18 Jun 2018 14:01:13 +0000 (16:01 +0200)]
Particle: Add missing field initializaiton

3 years agoUI: decorators hid non-array buttons
Campbell Barton [Mon, 18 Jun 2018 13:50:21 +0000 (15:50 +0200)]
UI: decorators hid non-array buttons

Error in last commit.

3 years agoStudiolights: Radiance icons were inverted.
Jeroen Bakker [Mon, 18 Jun 2018 13:45:55 +0000 (15:45 +0200)]
Studiolights: Radiance icons were inverted.

3 years agoWorkbench: increased Quality of the diffuse lighting model
Jeroen Bakker [Mon, 18 Jun 2018 13:17:46 +0000 (15:17 +0200)]
Workbench: increased Quality of the diffuse lighting model

- implemented Spherical Harmonics L2 for diffuse shading.

TODO: caching the precalculated harmonics so it won't take soo long to
open the popover

3 years agoObjects: when active object gets hidden, make it inactive.
Brecht Van Lommel [Mon, 18 Jun 2018 12:46:56 +0000 (14:46 +0200)]
Objects: when active object gets hidden, make it inactive.

3 years agoCleanup: simplify some view layer code.
Brecht Van Lommel [Mon, 18 Jun 2018 12:45:39 +0000 (14:45 +0200)]
Cleanup: simplify some view layer code.

3 years agoParticles: Remove obsolete code for child particles in edit mode
Sergey Sharybin [Mon, 18 Jun 2018 13:13:28 +0000 (15:13 +0200)]
Particles: Remove obsolete code for child particles in edit mode

3 years agoUI: decorators weren't showing icon-only buttons
Campbell Barton [Mon, 18 Jun 2018 13:11:10 +0000 (15:11 +0200)]
UI: decorators weren't showing icon-only buttons

3 years agoFix merge error in bpy_driver.c
Campbell Barton [Mon, 18 Jun 2018 13:09:55 +0000 (15:09 +0200)]
Fix merge error in bpy_driver.c

3 years agoUI: No decorators on render engine picker
Pablo Vazquez [Mon, 18 Jun 2018 10:41:31 +0000 (12:41 +0200)]
UI: No decorators on render engine picker

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Mon, 18 Jun 2018 10:32:12 +0000 (12:32 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesrna/intern/rna_space.c

3 years agoFix T55503: File browser filter not working correctly.
Bastien Montagne [Mon, 18 Jun 2018 10:26:47 +0000 (12:26 +0200)]
Fix T55503: File browser filter not working correctly.

There were two issues here, introduced by rB66aa4af836:
* Forgot to change length of some filter_glob var deep in filebrowser code.
* Truncating filter_glob in general can be dangerous, generating
unexpected patterns.

Last point was the root of the issue here, truncating to 63 chars string
left last group as 'match everything' `*` pattern.

To fix that to some extent, added a new BLI_path_extension_glob_validate
helper to BLI_path_util, which ensures we do not have last
wildcards-only group in our pattern, when there are more than one group.

3 years agoUI: Start UIList with 2 rows for materials/particles
Pablo Vazquez [Mon, 18 Jun 2018 10:20:58 +0000 (12:20 +0200)]
UI: Start UIList with 2 rows for materials/particles

There is room for it anyway because of the 3 buttons on the right.

3 years agoMultires: Remove unused function
Sergey Sharybin [Mon, 18 Jun 2018 09:14:00 +0000 (11:14 +0200)]
Multires: Remove unused function

It uses derived mesh, and relies on scene stored in modifier data.
So port is needed anyway.

3 years agoDepsgraph: Cleamup, reduce indentation level
Sergey Sharybin [Mon, 18 Jun 2018 07:52:58 +0000 (09:52 +0200)]
Depsgraph: Cleamup, reduce indentation level

3 years ago3D View: support outline overlay option
Campbell Barton [Mon, 18 Jun 2018 07:22:58 +0000 (09:22 +0200)]
3D View: support outline overlay option

3 years agoRefactor: Put ViewportAA as UserPref
Jeroen Bakker [Mon, 18 Jun 2018 06:51:29 +0000 (08:51 +0200)]
Refactor: Put ViewportAA as UserPref

By default users want AA in the viewport. For slower systems you want to
be able to turn it off. As in the future we would also like to support
TAA in the viewport we introduced it as a Max Viewport AA settings.

Also removed the drawoption to enable/disable AA per viewport
When rendering the AA is always turned on.

3 years agoShadingMenu: Splitted in SubPanels
Jeroen Bakker [Mon, 18 Jun 2018 06:15:29 +0000 (08:15 +0200)]
ShadingMenu: Splitted in SubPanels

3 years agoFix T55511: Decorator drag makes many undo steps
Campbell Barton [Mon, 18 Jun 2018 06:25:05 +0000 (08:25 +0200)]
Fix T55511: Decorator drag makes many undo steps

Each keyframe made a separate undo step.

3 years agoCleanup: indentation
Campbell Barton [Mon, 18 Jun 2018 06:10:23 +0000 (08:10 +0200)]
Cleanup: indentation

3 years agoCleanup: whitespace
Campbell Barton [Mon, 18 Jun 2018 06:08:08 +0000 (08:08 +0200)]
Cleanup: whitespace

3 years agoFix T55517: Property-split fails w/ expanded enum
Campbell Barton [Mon, 18 Jun 2018 05:52:17 +0000 (07:52 +0200)]
Fix T55517: Property-split fails w/ expanded enum

3 years agoUI: disable decorators for render output
Campbell Barton [Mon, 18 Jun 2018 05:38:06 +0000 (07:38 +0200)]
UI: disable decorators for render output

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 18 Jun 2018 05:34:31 +0000 (07:34 +0200)]
Merge branch 'master' into blender2.8

3 years agoRNA: disable animation for file output options
Campbell Barton [Mon, 18 Jun 2018 05:31:21 +0000 (07:31 +0200)]
RNA: disable animation for file output options

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 18:37:10 +0000 (20:37 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space cmake, make.bat
Campbell Barton [Sun, 17 Jun 2018 18:18:09 +0000 (20:18 +0200)]
Cleanup: trailing space cmake, make.bat

3 years agoCleanup: trailing space in CMake files
Campbell Barton [Sun, 17 Jun 2018 18:15:24 +0000 (20:15 +0200)]
Cleanup: trailing space in CMake files

3 years agoEdit Mesh: Fix buggy occlusion when in xray mode.
Clément Foucault [Sun, 17 Jun 2018 18:11:23 +0000 (20:11 +0200)]
Edit Mesh: Fix buggy occlusion when in xray mode.

This mimics the behaviour of the old wireframe mode. When in Xray mode,
don't use the limit selection to visible option.

Also hide the option if Xray is enabled.

3 years agoPython: Allow untrusted py-drivers to run limited expressions
Campbell Barton [Sun, 17 Jun 2018 17:51:05 +0000 (19:51 +0200)]
Python: Allow untrusted py-drivers to run limited expressions

Limit to a restricted set of built-ins, as well as the math module.
Also restrict of op-codes, disallowing imports and attribute access.

This allows most math expressions to run
without any performance cost once the initial check is done.

See: D1862 for details.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 15:10:19 +0000 (17:10 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space for remaining source/
Campbell Barton [Sun, 17 Jun 2018 15:06:28 +0000 (17:06 +0200)]
Cleanup: trailing space for remaining source/

3 years agoCleanup: trailing space for blenloader
Campbell Barton [Sun, 17 Jun 2018 15:06:07 +0000 (17:06 +0200)]
Cleanup: trailing space for blenloader

3 years agoCleanup: trailing space for blenkernel
Campbell Barton [Sun, 17 Jun 2018 15:05:51 +0000 (17:05 +0200)]
Cleanup: trailing space for blenkernel

3 years agoCleanup: trailing space for compositor
Campbell Barton [Sun, 17 Jun 2018 15:05:29 +0000 (17:05 +0200)]
Cleanup: trailing space for compositor

3 years agoCleanup: trailing space for freestyle
Campbell Barton [Sun, 17 Jun 2018 15:05:14 +0000 (17:05 +0200)]
Cleanup: trailing space for freestyle

3 years agoCleanup: trailing space for imbuf module
Campbell Barton [Sun, 17 Jun 2018 15:04:54 +0000 (17:04 +0200)]
Cleanup: trailing space for imbuf module

3 years agoCleanup: trailing space for modifiers
Campbell Barton [Sun, 17 Jun 2018 15:04:27 +0000 (17:04 +0200)]
Cleanup: trailing space for modifiers

3 years agoCleanup: trailing space for DNA headers
Campbell Barton [Sun, 17 Jun 2018 15:04:09 +0000 (17:04 +0200)]
Cleanup: trailing space for DNA headers

3 years agoCleanup: trailing space in source/gameengine/
Campbell Barton [Sun, 17 Jun 2018 15:01:43 +0000 (17:01 +0200)]
Cleanup: trailing space in source/gameengine/

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 17 Jun 2018 14:36:30 +0000 (16:36 +0200)]
Merge branch 'master' into blender2.8

3 years agoCleanup: trailing space for BLI
Campbell Barton [Sun, 17 Jun 2018 14:32:54 +0000 (16:32 +0200)]
Cleanup: trailing space for BLI

3 years agoCleanup: remove unused BLI_rebase_path
Campbell Barton [Sun, 17 Jun 2018 14:26:47 +0000 (16:26 +0200)]
Cleanup: remove unused BLI_rebase_path