3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Sun, 28 Jan 2018 16:49:58 +0000 (17:49 +0100)]
Merge branch 'master' into blender2.8

3 years agoUsual i18n/UI messages fixes.
Bastien Montagne [Sun, 28 Jan 2018 16:27:53 +0000 (17:27 +0100)]
Usual i18n/UI messages fixes.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 28 Jan 2018 06:18:56 +0000 (17:18 +1100)]
Merge branch 'master' into blender2.8

3 years agoCleanup: style, spelling
Campbell Barton [Sun, 28 Jan 2018 06:00:39 +0000 (17:00 +1100)]
Cleanup: style, spelling

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 28 Jan 2018 05:40:23 +0000 (16:40 +1100)]
Merge branch 'master' into blender2.8

3 years agoCleanup: use doxy sections for view3d_view.c
Campbell Barton [Sun, 28 Jan 2018 05:22:34 +0000 (16:22 +1100)]
Cleanup: use doxy sections for view3d_view.c

Also move ..._needs_opengl functions into view3d_utils.c

3 years agoUse factory startup for icon generation
Campbell Barton [Sun, 28 Jan 2018 05:03:32 +0000 (16:03 +1100)]
Use factory startup for icon generation

Avoids using local preferences.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 28 Jan 2018 04:20:19 +0000 (15:20 +1100)]
Merge branch 'master' into blender2.8

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Sun, 28 Jan 2018 04:18:33 +0000 (15:18 +1100)]
Merge branch 'master' into blender2.8

3 years agoCleanup: warning
Campbell Barton [Sun, 28 Jan 2018 04:15:32 +0000 (15:15 +1100)]
Cleanup: warning

3 years agoCleanup: move 3D view utilities into own file
Campbell Barton [Sun, 28 Jan 2018 03:44:42 +0000 (14:44 +1100)]
Cleanup: move 3D view utilities into own file

Operators and utility functions were getting too mixed up,
the files were also quite large.

3 years agoFix T53914: Volumetric scattering now goes correctly through transparent surfaces.
Stefan Werner [Sat, 27 Jan 2018 09:36:22 +0000 (10:36 +0100)]
Fix T53914: Volumetric scattering now goes correctly through transparent surfaces.

There was a check for volume bounces at every surface intersection. That could lead to a volume scattered path being terminated
when passing through a transparent surface. This check was superfluous, as the volume shader evaluation already checks the
number of volume bounces and once it passes the max, volume shaders will not return scatter events any more.

Reviewers: #cycles, brecht

Reviewed By: #cycles, brecht

Subscribers: brecht, #cycles

Tags: #cycles

Maniphest Tasks: T53914

Differential Revision:

3 years agoSpeed up a little drawing of UVs in the Image Editor
Germano [Fri, 26 Jan 2018 22:42:30 +0000 (20:42 -0200)]
Speed up a little drawing of UVs in the Image Editor

In my tests the previous loop was running in 200 ms. With this change it now runs in 17 ms.

The difference in the end is still not great because the `draw_uvs_lineloop_bmface` function is called for each face and has an ImmBegin and ImmEnd in the function itself

3 years agoCode refactor: make mixed small/large BSSRDF radii more robust.
Brecht Van Lommel [Fri, 26 Jan 2018 21:11:28 +0000 (22:11 +0100)]
Code refactor: make mixed small/large BSSRDF radii more robust.

3 years agoCollections: As it turned out, this is quite harmless to have accessible everwhere
Dalai Felinto [Fri, 26 Jan 2018 21:41:45 +0000 (19:41 -0200)]
Collections: As it turned out, this is quite harmless to have accessible everwhere

I think ultimately we may move these operators from the outliner space to scene.

Partial revert of a08f687b91a2a7880889.

3 years agoMake outliner new collection operator work via viewport too
Dalai Felinto [Fri, 26 Jan 2018 21:33:28 +0000 (19:33 -0200)]
Make outliner new collection operator work via viewport too

Technically this revert b3bcbc9e85aa. This however doesn't seem to be needed
any longer.

3 years agoOutliner: If a collection is empty and you drag something inside it, it opens up.
Dalai Felinto [Fri, 26 Jan 2018 18:55:44 +0000 (16:55 -0200)]
Outliner: If a collection is empty and you drag something inside it, it opens up.

Idea by Pablo Vazquez.

3 years agoFix mixed BSDF + BSSRDF sampling bug in path tracing, after 095a01a73a35.
Brecht Van Lommel [Fri, 26 Jan 2018 17:31:36 +0000 (18:31 +0100)]
Fix mixed BSDF + BSSRDF sampling bug in path tracing, after 095a01a73a35.

Spotted by Ha Hyung-jin, thanks!

3 years agoCode refactor: store RGB BSSRDF in a single closure.
Brecht Van Lommel [Fri, 26 Jan 2018 13:09:55 +0000 (14:09 +0100)]
Code refactor: store RGB BSSRDF in a single closure.

Previously we stored each color channel in a single closure, which was
convenient for sampling a closure and channel together. But this doesn't
work so well for algorithms where we want to render multiple color
channels together.

3 years agoIMB: Add asserts that returned fps and fps base are strictly positives.
Bastien Montagne [Fri, 26 Jan 2018 14:13:35 +0000 (15:13 +0100)]
IMB: Add asserts that returned fps and fps base are strictly positives.

Forgot to add that in previous commit, also related to T53003.

3 years agoRelated to T53003: tweak scene fps range.
Bastien Montagne [Fri, 26 Jan 2018 14:08:58 +0000 (15:08 +0100)]
Related to T53003: tweak scene fps range.

Move restricted 'reasonable' range to ui_range, and allow wider values
for manual settings.

3 years agoFix T53003: IMB: Invalid framerate handling due to short integer overflow.
Bastien Montagne [Fri, 26 Jan 2018 13:59:16 +0000 (14:59 +0100)]
Fix T53003: IMB: Invalid framerate handling due to short integer overflow.

FFMPEG uses int for the numerator, while Blender uses a short. So in
cases people gave weird exotic framerate values and we cannot reduce
enough the numerator, we'd get totally weird values (even negative frame
rates sometimes!)

Now we add checks for short overflow and approximate as best as possible
in that case (error should not matter unless you have shots of at least
several hundreds of hours ;) ).

3 years agofix:T53271 now using the context scene layer as requested
Gaia Clary [Fri, 26 Jan 2018 12:13:54 +0000 (13:13 +0100)]
fix:T53271 now using the context scene layer as requested

3 years agoFix Collada importer (crash)
Dalai Felinto [Fri, 26 Jan 2018 11:16:28 +0000 (09:16 -0200)]
Fix Collada importer (crash)

We were not tagging depsgraph to update its nodes after importing new objects.

3 years agoMake object_update comment about lack of ID even more clear
Dalai Felinto [Fri, 26 Jan 2018 11:15:56 +0000 (09:15 -0200)]
Make object_update comment about lack of ID even more clear

3 years agoFix silly crash on Collada
Dalai Felinto [Fri, 26 Jan 2018 10:42:55 +0000 (08:42 -0200)]
Fix silly crash on Collada

Note: This was originally wrongly committed together with an outliner tooltip
fix, re-committing separately now. See bd7060a87fd9.

3 years agoOutliner tooltips: Small refactor, future proof change
Dalai Felinto [Fri, 26 Jan 2018 10:42:15 +0000 (08:42 -0200)]
Outliner tooltips: Small refactor, future proof change

In the future we may have siblings to collections (like overrides) that are not
collections. This change make sure tooltips will keep working.

Note: This was originally wrongly committed together with a Collada fix,
re-committing separately now. See bd7060a87fd9.

3 years agoRevert "Fix crash on Collada exporter"
Dalai Felinto [Fri, 26 Jan 2018 10:40:11 +0000 (08:40 -0200)]
Revert "Fix crash on Collada exporter"

This reverts commit bd7060a87fd9f46c2bdd141e26934e8573c6e3f8.

I mixed two commits together (a fixup for outliner tooltips and a collada fix).
Re-committing them individually.

3 years agoFix crash on Collada exporter
Dalai Felinto [Fri, 26 Jan 2018 10:38:46 +0000 (08:38 -0200)]
Fix crash on Collada exporter

3 years agoOutliner: Tooltips for reorder operators
Dalai Felinto [Thu, 25 Jan 2018 18:09:50 +0000 (16:09 -0200)]
Outliner: Tooltips for reorder operators

I really would prefer if we were to use the dropbox API for this.
That said, we now have some tooltips that work.

I'm using the new draw callback draw API for outliner tooltips.

Reviewers: mont29

Subscribers: venomgfx, mano-wii, Severin

Differential Revision:

3 years agoFix harmlness RNA warning in image texture node drawing.
Brecht Van Lommel [Fri, 26 Jan 2018 07:39:38 +0000 (08:39 +0100)]
Fix harmlness RNA warning in image texture node drawing.

3 years agoFix part of T53080: all material previews re-rendering after undo.
Brecht Van Lommel [Fri, 26 Jan 2018 06:54:09 +0000 (07:54 +0100)]
Fix part of T53080: all material previews re-rendering after undo.

This reverts commit dc2617130b2e1d7d2b9892fbd7c6e7b60caafb66, which disabled
writing of previews for undo. While this uses some memory, re-rendering all
previews is very expensive, especially if for example you have lots of materials
using high-res image textures.

3 years agoCode cleanup: simpler and faster detection of BVH refit.
Brecht Van Lommel [Thu, 25 Jan 2018 15:11:06 +0000 (16:11 +0100)]
Code cleanup: simpler and faster detection of BVH refit.

3 years agoFix navmesh creation w/ multiple objects
Campbell Barton [Fri, 26 Jan 2018 02:10:02 +0000 (13:10 +1100)]
Fix navmesh creation w/ multiple objects

D2976 by @dertom

3 years agomake_quickie: replace os.system w/
Campbell Barton [Fri, 26 Jan 2018 01:53:42 +0000 (12:53 +1100)]
make_quickie: replace os.system w/

3 years agoicon update: replace os.system w/ subprocess.check_call
Campbell Barton [Fri, 26 Jan 2018 01:46:10 +0000 (12:46 +1100)]
icon update: replace os.system w/ subprocess.check_call

3 years agoproject_info: replace os.system w/ subprocess.check_call
Campbell Barton [Fri, 26 Jan 2018 01:29:55 +0000 (12:29 +1100)]
project_info: replace os.system w/ subprocess.check_call

3 years agoTests: replace os.system w/
Campbell Barton [Fri, 26 Jan 2018 01:23:15 +0000 (12:23 +1100)]
Tests: replace os.system w/

Saves on process creation and avoids
being tripped up by command line parsing.

Based on D2967 by @ldo with edits.

3 years agoDocs: invoke_search_popup uses bl_property
Campbell Barton [Fri, 26 Jan 2018 00:52:01 +0000 (11:52 +1100)]
Docs: invoke_search_popup uses bl_property

Also add code example in docs.

3 years agoOutliner: Implement Add (Ctrl) when moving objects inside collection
Dalai Felinto [Thu, 25 Jan 2018 14:42:20 +0000 (12:42 -0200)]
Outliner: Implement Add (Ctrl) when moving objects inside collection

Note there is no "text" explaining to users what is going on.
I will address this shortly in an upcoming commit.

3 years agoLayer: Update outdated code comment
Dalai Felinto [Thu, 25 Jan 2018 19:50:25 +0000 (17:50 -0200)]
Layer: Update outdated code comment

3 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Dalai Felinto [Thu, 25 Jan 2018 13:31:54 +0000 (11:31 -0200)]
Merge remote-tracking branch 'origin/master' into blender2.8

3 years agoCycles: rename displacement methods, default to displace, tweak panel layout.
Brecht Van Lommel [Thu, 25 Jan 2018 13:08:56 +0000 (14:08 +0100)]
Cycles: rename displacement methods, default to displace, tweak panel layout.

Differential Revision:

3 years agoFix T53874: OpenGL render problem with OpenEXR in 2.8 with float buffers.
Brecht Van Lommel [Thu, 25 Jan 2018 13:07:51 +0000 (14:07 +0100)]
Fix T53874: OpenGL render problem with OpenEXR in 2.8 with float buffers.

3 years agoNo need to tag depsgraph id when dropping objects from the outliner
Dalai Felinto [Thu, 25 Jan 2018 13:14:13 +0000 (11:14 -0200)]
No need to tag depsgraph id when dropping objects from the outliner

As done by c42fc19a8a1c71 - this was needed originally because notifiers were
not working so I had to force tagging.

And for the records, I should have used DEG_TAG_BASE_FLAGS_UPDATE instead of 0.

3 years agoFix Eevee error message
Dalai Felinto [Thu, 25 Jan 2018 12:59:41 +0000 (10:59 -0200)]
Fix Eevee error message

That said, this should be informed to the user, not printed in the console.

3 years agoFix missing broken notifiers
Dalai Felinto [Thu, 25 Jan 2018 12:10:21 +0000 (10:10 -0200)]
Fix missing broken notifiers

We can't have more than one NOTE_SUBTYPE in the same notifier.
Instead of calling both subtypes the code end up not calling either.

3 years agoFix crash when drag&drop invisible object from outliner to viewport
Dalai Felinto [Thu, 25 Jan 2018 11:26:15 +0000 (09:26 -0200)]
Fix crash when drag&drop invisible object from outliner to viewport

This is not the issue actually mentioned there. However it is the most serious

Now if the object being dragged was not in a collection linked in the viewlayer
or invisible, we add it to the active collection (or create one if necessary).

This is related to T50967, which is now fully fixed.

3 years agoMerge remote-tracking branch 'origin/master' into blender2.8
Dalai Felinto [Thu, 25 Jan 2018 11:55:59 +0000 (09:55 -0200)]
Merge remote-tracking branch 'origin/master' into blender2.8

3 years agoFix T50967: When you move an icon from the outliner area object doesn't show up
Dalai Felinto [Thu, 25 Jan 2018 11:45:13 +0000 (09:45 -0200)]
Fix T50967: When you move an icon from the outliner area object doesn't show up

We can't have more than one NOTE_SUBTYPE in the same notifier.

This is a partial revert of: cd4d5dcb468a. In particular to the part concerning
"Also fixed a missing notifier of the object instancing operator".

Not only this was mixed with the original reason for the commit for no reason,
but it actually introduced a bug. Bad, bad developers ;)

Note: Although this commit is not needed for master, blender2.8 requires it for
the forementioned bug report.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 25 Jan 2018 11:20:27 +0000 (22:20 +1100)]
Merge branch 'master' into blender2.8

3 years agoWM: comments on wmTooltipState struct
Campbell Barton [Thu, 25 Jan 2018 10:49:31 +0000 (21:49 +1100)]
WM: comments on wmTooltipState struct

3 years agoWM: NULL check for recent tooltip change
Campbell Barton [Thu, 25 Jan 2018 10:39:04 +0000 (21:39 +1100)]
WM: NULL check for recent tooltip change

Caused crash dragging boolean buttons.

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Thu, 25 Jan 2018 09:15:31 +0000 (10:15 +0100)]
Merge branch 'master' into blender2.8


3 years agoFix T53363: Blender won't update mesh's usercount when deleting object datablocks...
Bastien Montagne [Thu, 25 Jan 2018 09:11:12 +0000 (10:11 +0100)]
Fix T53363: Blender won't update mesh's usercount when deleting object datablocks in Editmode.

Only do special handling of ob->data pointer in case we are remapping to
a valid (non-NULL) other obdata. Otherwise, handle it as any other
'remapping to NULL' case.

Hopefully not breaking anything else...

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Thu, 25 Jan 2018 05:28:06 +0000 (16:28 +1100)]
Merge branch 'master' into blender2.8

3 years agoUI: change tool-tips to be stored in the screen
Campbell Barton [Thu, 25 Jan 2018 05:17:25 +0000 (16:17 +1100)]
UI: change tool-tips to be stored in the screen

Move timer and tip out of button code,
now the only requests a tooltip,
passing a creation callback to run.

Needed for manipulators in 2.8,
also helps de-duplicate logic - since we never want
multiple tool-tips showing at once.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 24 Jan 2018 23:31:37 +0000 (10:31 +1100)]
Merge branch 'master' into blender2.8

3 years agoCleanup: correct ATTR_NONNULL use
Campbell Barton [Wed, 24 Jan 2018 23:21:31 +0000 (10:21 +1100)]
Cleanup: correct ATTR_NONNULL use

3 years agoFix T53874: more cases of OpenGL render to OpenEXR not working after recent changes.
Brecht Van Lommel [Wed, 24 Jan 2018 14:55:54 +0000 (15:55 +0100)]
Fix T53874: more cases of OpenGL render to OpenEXR not working after recent changes.

3 years agoFix T53593: sculpt brush rake spacing bug after recent bugfix.
Brecht Van Lommel [Wed, 24 Jan 2018 13:25:59 +0000 (14:25 +0100)]
Fix T53593: sculpt brush rake spacing bug after recent bugfix.

3 years agoFix T53115: Memleak with instanced groups and Cycles
Sergey Sharybin [Wed, 24 Jan 2018 14:46:34 +0000 (15:46 +0100)]
Fix T53115: Memleak with instanced groups and Cycles

The issue was caused by Cycles allocating ID property in a temporary object
which gets overwritten and thrown away every so often.

Now dependency graph will try to reliably check whether ID properties from
a temp object are to be freed.

3 years agoDepsgraph: Cleanup, line wrap
Sergey Sharybin [Wed, 24 Jan 2018 14:34:33 +0000 (15:34 +0100)]
Depsgraph: Cleanup, line wrap

3 years agoDepsgraph: Add missing synchronize code to scene
Sergey Sharybin [Wed, 24 Jan 2018 14:01:05 +0000 (15:01 +0100)]
Depsgraph: Add missing synchronize code to scene

The issue here is that we can not duplicate the whole datablock since we
use view layer pointers in depsgraph callbacks.

Maybe this whole chunk of code belongs to somewhere else, or maybe we
can find a smart solution to avoid need of CoW pointers passed to the
evaluation functions.

This fixes lack of viewport update when toggling collection enabled flag.

3 years agoAdd utility function to reset ID property value to a given one
Sergey Sharybin [Wed, 24 Jan 2018 14:00:01 +0000 (15:00 +0100)]
Add utility function to reset ID property value to a given one

This is similar to idproperty_reset() defined in layer.c, but it does not
re-alloc property itself.

We should replace idproperty_reset() with IDP_Reset() now.

3 years agoManipulator: icon highlight could be darker
Campbell Barton [Wed, 24 Jan 2018 13:44:55 +0000 (00:44 +1100)]
Manipulator: icon highlight could be darker

Use color and highlight from theme.

3 years agoFix for fix w/ GPU_batch_wire_from_poly_2d_encoded
Campbell Barton [Wed, 24 Jan 2018 13:43:45 +0000 (00:43 +1100)]
Fix for fix w/ GPU_batch_wire_from_poly_2d_encoded

Was missing first edge

3 years agoFix T53646: Blender 2.8 multiple crashes in auto UVs generation
Sergey Sharybin [Wed, 24 Jan 2018 13:00:49 +0000 (14:00 +0100)]
Fix T53646: Blender 2.8 multiple crashes in auto UVs generation

Make sure scene and view_layer set for depsgraph before running editors
update. This is required since tagging might happen before we created depsgraph.

3 years agoManipulator: add show_drag option for 2d buttons
Campbell Barton [Wed, 24 Jan 2018 12:29:17 +0000 (23:29 +1100)]
Manipulator: add show_drag option for 2d buttons

Needed so 3d navigation buttons can show show drag cursor
only for buttons with modal operators.

3 years agoFix bug in view navigation icons
Campbell Barton [Wed, 24 Jan 2018 11:54:11 +0000 (22:54 +1100)]
Fix bug in view navigation icons

Own error in GPU_batch_wire_from_poly_2d_encoded
Wasn't correctly filling in the VBO with edges.

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Wed, 24 Jan 2018 11:14:59 +0000 (12:14 +0100)]
Merge branch 'master' into blender2.8


3 years agoDepsgraph: Fix crash entering edit mode with CoW enabled
Sergey Sharybin [Wed, 24 Jan 2018 10:46:54 +0000 (11:46 +0100)]
Depsgraph: Fix crash entering edit mode with CoW enabled

The issue was caused by some incompatibility of new API which expects ID block
to be specified explicitly, while old code is tagging object's data using
object's ID with OB_RECALC_DATA flag.

We need to switch all areas to give proper ID and everything, but for until
then we'd better stop crashing.

3 years agoCleanup: MOD_wireframe: remove useless isDisabled callback.
Bastien Montagne [Wed, 24 Jan 2018 10:20:46 +0000 (11:20 +0100)]
Cleanup: MOD_wireframe: remove useless isDisabled callback.

3 years agoFix (unreported) missing feature in ccgdm pbvh generator.
Bastien Montagne [Wed, 24 Jan 2018 10:17:53 +0000 (11:17 +0100)]
Fix (unreported) missing feature in ccgdm pbvh generator.

Compared to usual cddm one, ccgdm one was not applying the
ob->derivedDeform deformation to the pbvh generated from the
original mesh geometry, when possible.

3 years agoFix T53551: Weight paint crash when subsurf modifier is not first (master not 2.79).
Bastien Montagne [Wed, 24 Jan 2018 10:13:49 +0000 (11:13 +0100)]
Fix T53551: Weight paint crash when subsurf modifier is not first (master not 2.79).

We can only support painting from subsurf DM in a limited subset of
cases, others (like multiple subsurf, or topology-modyfying ones,
break mapping to original geometry).

This is not the most ideal fix (ideally, we should always be able to get
a mapping to original geometry from any point in modifiers stack...).

3 years agoBKE's modifier_isEnabled: add check on NULL Scene pointer.
Bastien Montagne [Wed, 24 Jan 2018 10:12:01 +0000 (11:12 +0100)]
BKE's modifier_isEnabled: add check on NULL Scene pointer.

We do not always have that one available, and even without the
isDisabled callback this func is helpful.

Note that this is a bot stupid, only modifier actually needing a valid
Scene pointer here is subsurf... :|

3 years agoFix T53874: OpenGL render to OpenEXR not working after recent changes.
Brecht Van Lommel [Wed, 24 Jan 2018 10:03:03 +0000 (11:03 +0100)]
Fix T53874: OpenGL render to OpenEXR not working after recent changes.

Multilayer EXR also failed already in 2.79 for Sequencer and OpenGL rendering.
Now we revert to single layer OpenEXR in that case.

3 years agoDepsgraph: Fix evaluaiton order with nested animation and copy on write
Sergey Sharybin [Wed, 24 Jan 2018 10:00:37 +0000 (11:00 +0100)]
Depsgraph: Fix evaluaiton order with nested animation and copy on write

It is possible to have animation (or driver) to modify nested datablock, such
as shape key value for example (where animation is on Mesh level, but shape key
is it's own datablock). To deal with such cases we need to create relation
from nested datablock CoW to animaiton/driver operation.

3 years agoFix T53878: Cycles bug rendering multiple render layers with different passes.
Brecht Van Lommel [Wed, 24 Jan 2018 09:56:13 +0000 (10:56 +0100)]
Fix T53878: Cycles bug rendering multiple render layers with different passes.

This was caused by recent pass refactoring from f78e963.

3 years agoFix Cycles GLSL bump not matching final render after recent changes.
Brecht Van Lommel [Wed, 24 Jan 2018 07:24:21 +0000 (08:24 +0100)]
Fix Cycles GLSL bump not matching final render after recent changes.

3 years agoCleanup: typo
Campbell Barton [Wed, 24 Jan 2018 07:22:59 +0000 (18:22 +1100)]
Cleanup: typo

3 years agoManipulators: disable 3D widgets w/ animation
Campbell Barton [Wed, 24 Jan 2018 06:31:11 +0000 (17:31 +1100)]
Manipulators: disable 3D widgets w/ animation

Workaround for T53078.

3 years agoFix Cycles inserting displacement node when there is a custom node setup instead.
Brecht Van Lommel [Wed, 24 Jan 2018 06:08:36 +0000 (07:08 +0100)]
Fix Cycles inserting displacement node when there is a custom node setup instead.

3 years agoFix "GPUTexture: texture alloc failed. Not enough Video Memory." in area resizing
Germano [Wed, 24 Jan 2018 00:50:05 +0000 (22:50 -0200)]
Fix "GPUTexture: texture alloc failed. Not enough Video Memory." in area resizing

`gpu_texture_try_alloc` invalidates zero-sized textures.
The message in the console is not correct in this case (because it is not due to lack of memory).

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 24 Jan 2018 00:45:34 +0000 (11:45 +1100)]
Merge branch 'master' into blender2.8

3 years agoCMake: store icon names
Campbell Barton [Wed, 24 Jan 2018 00:29:29 +0000 (11:29 +1100)]
CMake: store icon names

Without this, adding/removing icons wouldn't force cmake to re-run
making builds fail.

This is the same issue with globbing source code.

3 years agoFix object mode/edit mode panels not visible in collections
Dalai Felinto [Tue, 23 Jan 2018 18:05:25 +0000 (16:05 -0200)]
Fix object mode/edit mode panels not visible in collections

This was broken since e8c15e0ed15f83. When object_mode moved from
workspace to window.

3 years agoGreasepencil icons
Dalai Felinto [Tue, 23 Jan 2018 13:55:32 +0000 (11:55 -0200)]
Greasepencil icons

Note this comes from the greasepencil-object branch, and are merged to help
preventing future merge conflicts.

Also, I renamed the icons for consistency sake. So when this is merged in 2.8
other areas of the code will need to change.

Icons by Matias Mendiola

3 years agoRevert "Grease-Pencil: Icons"
Dalai Felinto [Tue, 23 Jan 2018 12:41:25 +0000 (10:41 -0200)]
Revert "Grease-Pencil: Icons"

This reverts commits:

f0ef3603862 Grease-Pencil: Icons from the grease pencil branch
13bf4b3804b Grease-Pencil: Fixup for icons
fb8c382fa17 Grease Pencil dat files fix

3 years agoCleanup: some ED_view3d functions used uppercase D
Campbell Barton [Tue, 23 Jan 2018 09:22:26 +0000 (20:22 +1100)]
Cleanup: some ED_view3d functions used uppercase D

3 years agoMerge branch 'master' into blender2.8
Brecht Van Lommel [Tue, 23 Jan 2018 12:11:02 +0000 (13:11 +0100)]
Merge branch 'master' into blender2.8

3 years agoFix Cycles assert when resizing rendererd viewport.
Brecht Van Lommel [Tue, 23 Jan 2018 12:01:02 +0000 (13:01 +0100)]
Fix Cycles assert when resizing rendererd viewport.

3 years agoCycles: change material output displacement to vector.
Brecht Van Lommel [Sat, 20 Jan 2018 01:01:07 +0000 (02:01 +0100)]
Cycles: change material output displacement to vector.

Previously only scalar displacement along the normal was supported,
now displacement can go in any direction. For backwards compatibility,
a Displacement node will be automatically inserted in existing files.

This will make it possible to support vector displacement maps in the
future. It's already possible to use them to some extent, but requires
a manual shader node setup. For tangent space maps the right tangent
may also not be available yet, depends on the map.

Differential Revision:

3 years agoCycles: add Displacement node.
Brecht Van Lommel [Sat, 13 Jan 2018 12:11:03 +0000 (13:11 +0100)]
Cycles: add Displacement node.

This converts object space height to world space displacement, to be
linked to the new vector displacement material output.

Differential Revision:

3 years agoFix T53854: branched path tracing correlation bug with transparency in split kernel.
Brecht Van Lommel [Tue, 23 Jan 2018 09:44:20 +0000 (10:44 +0100)]
Fix T53854: branched path tracing correlation bug with transparency in split kernel.

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 23 Jan 2018 09:04:54 +0000 (20:04 +1100)]
Merge branch 'master' into blender2.8

3 years agoCleanup: use doxygen groups for view3d_edit.c
Campbell Barton [Tue, 23 Jan 2018 08:48:49 +0000 (19:48 +1100)]
Cleanup: use doxygen groups for view3d_edit.c

3 years agoCleanup: code comment for view3d_viewmatrix_set
Campbell Barton [Tue, 23 Jan 2018 06:36:51 +0000 (17:36 +1100)]
Cleanup: code comment for view3d_viewmatrix_set

3 years agoCleanup: CMake whitespace
Campbell Barton [Tue, 23 Jan 2018 06:25:09 +0000 (17:25 +1100)]
Cleanup: CMake whitespace

3 years agoManipulator: limit UI for locked views
Campbell Barton [Tue, 23 Jan 2018 06:11:13 +0000 (17:11 +1100)]
Manipulator: limit UI for locked views