4 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Fri, 14 Apr 2017 10:36:56 +0000 (12:36 +0200)]
Merge branch 'master' into blender2.8


4 years agoFix Blenderplayer (c)
Bastien Montagne [Thu, 13 Apr 2017 10:36:19 +0000 (12:36 +0200)]
Fix Blenderplayer (c)

4 years agoCleanup: triple quotes for docstrings
Campbell Barton [Fri, 14 Apr 2017 10:01:43 +0000 (20:01 +1000)]
Cleanup: triple quotes for docstrings

4 years agoBLF: avoid glyph cache use-after free
Campbell Barton [Fri, 14 Apr 2017 09:52:29 +0000 (19:52 +1000)]
BLF: avoid glyph cache use-after free

Causes crash if the font size isn't set after clearing (see T51200)

4 years agoBuildbot: Fix typos
Sergey Sharybin [Fri, 14 Apr 2017 08:03:30 +0000 (10:03 +0200)]
Buildbot: Fix typos

4 years agoBuildbot: Attempt to fix CUDA compilation on OSX
Sergey Sharybin [Fri, 14 Apr 2017 08:01:28 +0000 (10:01 +0200)]
Buildbot: Attempt to fix CUDA compilation on OSX

Stupid toolkit is really fragile about CLang version.

4 years agoOpenGL: use ShaderInterface to look up uniforms
Mike Erwin [Thu, 13 Apr 2017 22:37:26 +0000 (18:37 -0400)]
OpenGL: use ShaderInterface to look up uniforms

These were the last few glGetUniformLocation calls in source/blender.

The new system gets uniform information once when a shader is created, then uses this cached info every time after that.

4 years agoRevert "OpenGL core: add some missing gpuBegin to allow clay with no UI"
Dalai Felinto [Thu, 13 Apr 2017 16:49:16 +0000 (18:49 +0200)]
Revert "OpenGL core: add some missing gpuBegin to allow clay with no UI"

This reverts commit 1c01811cce00b799ee94aad24083ddf3954a5829.

It broke everything.

4 years agoUI: Add/Improve a few tooltips
Aaron Carlisle [Thu, 13 Apr 2017 22:07:10 +0000 (18:07 -0400)]
UI: Add/Improve a few tooltips

See T51061

4 years agoDraw Manager: lattice editmode drawing
Campbell Barton [Thu, 13 Apr 2017 13:29:45 +0000 (23:29 +1000)]
Draw Manager: lattice editmode drawing

4 years agoOpenGL core: add some missing gpuBegin to allow clay with no UI
Dalai Felinto [Thu, 13 Apr 2017 16:49:16 +0000 (18:49 +0200)]
OpenGL core: add some missing gpuBegin to allow clay with no UI

4 years agoOpenGL: do not support legacy matrix when using core profile
Dalai Felinto [Thu, 13 Apr 2017 14:49:39 +0000 (16:49 +0200)]
OpenGL: do not support legacy matrix when using core profile

4 years agoRemove deprecated opengl stuff from opensubdiv
Luca Rood [Thu, 13 Apr 2017 14:52:13 +0000 (16:52 +0200)]
Remove deprecated opengl stuff from opensubdiv

This removes glGetBooleanv queries for GL_LIGHTING. This has been #ifdef'd
out with legacy opengl disabled. Thus a false positive still shows up in
the gl queries. Also, note that this removes support for wireframes in
opensubdiv, when desabling legacy opengl, which should be fixed later.

Part of T49043

4 years agoRemove some elbeem debug functions
Luca Rood [Wed, 12 Apr 2017 13:24:42 +0000 (15:24 +0200)]
Remove some elbeem debug functions

Some elbeem debug functions had old gl drawing calls. I removed the
functions instead of converting, because Blender doesn't even build
with them enabled anymore, because some elbeem debug libs got removed
at some point.

Part of T49043

4 years agoAlembic export: unified code of exploreTransform and exploreObject.
Sybren A. Stüvel [Tue, 11 Apr 2017 12:59:48 +0000 (14:59 +0200)]
Alembic export: unified code of exploreTransform and exploreObject.

4 years agoAlembic export: added support for writing dupli-groups
Sybren A. Stüvel [Wed, 12 Apr 2017 10:35:09 +0000 (12:35 +0200)]
Alembic export: added support for writing dupli-groups

This supports our common character animation workflow, where a character,
its rig, and the custom bone shapes are all part of a group. This group
is then linked into the scene, the rig is proxified and animated. Such
a group can now be exported. Use "Renderable objects only" to prevent
writing the custom bone shapes to the Alembic file.

4 years agoUnittests for depsgraph layer collection render settings evaluation
Dalai Felinto [Thu, 13 Apr 2017 14:28:47 +0000 (16:28 +0200)]
Unittests for depsgraph layer collection render settings  evaluation

Some of the tests are failing at the moment.
Those problems were introduced in eba09b1520

4 years agoFix Surface Deform crash with missing or freed DM
Luca Rood [Thu, 13 Apr 2017 13:39:16 +0000 (15:39 +0200)]
Fix Surface Deform crash with missing or freed DM

4 years agoUpdate despsgraph when set/unset variables
Dalai Felinto [Thu, 13 Apr 2017 13:38:35 +0000 (15:38 +0200)]
Update despsgraph when set/unset variables

4 years agoLayer collection settings API
Dalai Felinto [Thu, 13 Apr 2017 13:38:15 +0000 (15:38 +0200)]
Layer collection settings API

This way we can set a property via RNA, and also force an update of scene layer (which I am using for unittesting)

4 years agoCycles: Make vectorized types constructor from register explicit
Sergey Sharybin [Thu, 13 Apr 2017 13:07:07 +0000 (15:07 +0200)]
Cycles: Make vectorized types constructor from register explicit

This is not a cheap operation which we dont' want to happen silently.

4 years agoCycles: Remove unused function
Sergey Sharybin [Thu, 13 Apr 2017 13:01:55 +0000 (15:01 +0200)]
Cycles: Remove unused function

It was quite wrong actually by doing some __m128 to flaot4 round trips.

4 years agoAlembic import: fixed off-by-one error in start/end frame
Sybren A. Stüvel [Thu, 13 Apr 2017 12:50:02 +0000 (14:50 +0200)]
Alembic import: fixed off-by-one error in start/end frame

static_cast<int> truncates, so a computed end frame of 99.999999999998
would result in 99, instead of the correct 100.

4 years agoDraw Manager: initial lattice support
Campbell Barton [Thu, 13 Apr 2017 12:09:59 +0000 (22:09 +1000)]
Draw Manager: initial lattice support

Still misses support for edit-mode selection & weight drawing.

4 years agoCleanup: minor changes to logic for outline drawing
Campbell Barton [Thu, 13 Apr 2017 11:44:24 +0000 (21:44 +1000)]
Cleanup: minor changes to logic for outline drawing

Use brace placement following code-style too.

4 years agoTask scheduler: Fix typo in TLS for pools created from non-main thread
Sergey Sharybin [Thu, 13 Apr 2017 11:32:39 +0000 (13:32 +0200)]
Task scheduler: Fix typo in TLS for pools created from non-main thread

Did a mistake which started to use same TLS for all threads for such pools.

Also added some extra asserts to help catching the bugs.

4 years agoFix Blenderplayer (c)
Bastien Montagne [Thu, 13 Apr 2017 10:36:19 +0000 (12:36 +0200)]
Fix Blenderplayer (c)

4 years agoFix RNA LayerCollectionEngineSettingsClay not inheriting from LayerCollectionSettings.
Bastien Montagne [Thu, 13 Apr 2017 10:16:32 +0000 (12:16 +0200)]
Fix RNA LayerCollectionEngineSettingsClay not inheriting from LayerCollectionSettings.

Was hence missing the 'name' property, which broke the 'dict-like'
behavior of Scene.collection_properties.

4 years agoMerge branch 'master' into blender2.8
Alexander Romanov [Thu, 13 Apr 2017 10:02:39 +0000 (13:02 +0300)]
Merge branch 'master' into blender2.8

4 years agoAdd red alert in UI controls for datablock pointer properties
Alexander Romanov [Thu, 13 Apr 2017 09:59:04 +0000 (12:59 +0300)]
Add red alert in UI controls for datablock pointer properties

4 years agoDraw Engine: Draw sets recursively
Campbell Barton [Thu, 13 Apr 2017 09:42:43 +0000 (19:42 +1000)]
Draw Engine: Draw sets recursively

Matchers regular viewport behavior

4 years agoDatablock ID Properties
Alexander Romanov [Thu, 13 Apr 2017 09:30:03 +0000 (12:30 +0300)]
Datablock ID Properties

The absence of datablock properties "will certainly be resolved soon as the need for them is becoming obvious" said the [[|Python Nodes release notes]]. So this patch allows Python scripts to create ID Properties which reference datablocks.
This functionality is implemented for `PointerProperty` and now such properties can be created with Python.

In addition to the standard update callback, `PointerProperty` can have a `poll` callback (standard RNA) which is useful for search menus. For details see the test included in this patch.

Original author: @artfunkel

Alexander (Blend4Web Team)

Reviewers: brecht, artfunkel, mont29, campbellbarton

Reviewed By: mont29, campbellbarton

Subscribers: jta, sergey, campbellbarton, wisaac, poseidon4o, mont29, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov, fjuhec, sharlybg, cardboard, duarteframos, blueprintrandom, a.romanov, BYOB, disnel, aditiapratama, bliblubli, dfelinto, lukastoenne

Maniphest Tasks: T37754

Differential Revision:

4 years agoCycles: Header cleanup in BVH: move self header to be the first one
Sergey Sharybin [Thu, 13 Apr 2017 09:20:33 +0000 (11:20 +0200)]
Cycles: Header cleanup in BVH: move self header to be the first one

This makes us more sure that header files are more self-sufficient.

4 years agoUse regular header guards in GPU
Campbell Barton [Thu, 13 Apr 2017 09:10:55 +0000 (19:10 +1000)]
Use regular header guards in GPU

4 years agoCycles: Split BVH implementations into separate files
Sergey Sharybin [Thu, 13 Apr 2017 08:55:46 +0000 (10:55 +0200)]
Cycles: Split BVH implementations into separate files

4 years agoCycles: Use more explicit and commonly used names for BVH structures
Sergey Sharybin [Thu, 13 Apr 2017 08:29:14 +0000 (10:29 +0200)]
Cycles: Use more explicit and commonly used names for BVH structures

This renames BinaryBVH to BVH2 and QBVH to BVH8. There is no user measurable
difference, but allows us to add more types of BVH trees such as BVH8.

4 years agoOpenGL: implement 2D with 4x4 matrices
Mike Erwin [Thu, 13 Apr 2017 08:00:19 +0000 (04:00 -0400)]
OpenGL: implement 2D with 4x4 matrices

... even though 3x3 feels better.

This is a compromise to get core profile up & running sooner. Eventually I'd like to finish the original 3x3 plans, but this commit will let us get on with other tasks.

External API stays (almost) the same. Our GLSL shaders can use this without any changes.

Part of T49450 and T51164

4 years agouse new 3D matrix impl in draw manager
Mike Erwin [Thu, 13 Apr 2017 05:03:49 +0000 (01:03 -0400)]
use new 3D matrix impl in draw manager

These functions mark the beginning and end of 3D drawing, causing the matrix API to use our own implementation instead of legacy OpenGL.

Part of T49450

4 years agoGawain: look up array uniforms correctly
Mike Erwin [Thu, 13 Apr 2017 04:51:18 +0000 (00:51 -0400)]
Gawain: look up array uniforms correctly

Look up "name[0]" when asked for "name", since that marks the beginning of the array.

We're comparing to the name stored in ShaderInterface which comes from glGetActiveUniform.

4 years agocleanup image drawing setup
Mike Erwin [Wed, 12 Apr 2017 23:11:31 +0000 (19:11 -0400)]
cleanup image drawing setup

4 years agoGawain: use ShaderInterface to manage uniforms
Mike Erwin [Wed, 12 Apr 2017 22:55:32 +0000 (18:55 -0400)]
Gawain: use ShaderInterface to manage uniforms

This eliminates tons of glGetUniformLocation calls from the drawing loop. Vast majority of code can keep making the same function calls. They're just faster now!

- Batch_Uniform*
- immUniform*
- gpuBindMatrices
- and others

4 years agoGawain: add immUniform4iv
Mike Erwin [Wed, 12 Apr 2017 22:20:58 +0000 (18:20 -0400)]
Gawain: add immUniform4iv

Needed soon by OCIO.

4 years agoGawain: add (temp) legacy GLSL support to ShaderInterface
Mike Erwin [Wed, 12 Apr 2017 22:03:18 +0000 (18:03 -0400)]
Gawain: add (temp) legacy GLSL support to ShaderInterface

A temporary measure needed by GPU_basic_shader.

Part of T51164

4 years agoGawain: improve ShaderInterface
Mike Erwin [Wed, 12 Apr 2017 21:56:26 +0000 (17:56 -0400)]
Gawain: improve ShaderInterface

- builtin uniforms match what Blender needs
- set input counts in struct (stupid mistake)
- look up uniforms by name
- look up builtin uniforms by enum
- check attrib/uniform locations for error

4 years agoGLSL: rename edit_overlay -> edit_mesh_overlay
Campbell Barton [Thu, 13 Apr 2017 04:13:46 +0000 (14:13 +1000)]
GLSL: rename edit_overlay -> edit_mesh_overlay

Avoid confusion with overlays with non-mesh types

4 years agoUse 'safe' macros for common free operation
Campbell Barton [Thu, 13 Apr 2017 03:30:53 +0000 (13:30 +1000)]
Use 'safe' macros for common free operation

Same as MEM_SAFE_FREE macro,
checks for NULL, runs free then sets NULL.

Blocks of code that do this many times are noisy and likely
errors here wouldn't be noticed immediately.

Also NULL's static vars which were being left set.

4 years agofix drawing file column dividers (T51189)
Mike Erwin [Wed, 12 Apr 2017 18:16:43 +0000 (14:16 -0400)]
fix drawing file column dividers (T51189)

Problem was an edge case where vertex_ct logic and draw logic disagreed on how many dividers to draw.

Fix: copy draw logic to earlier vertex_ct

I also skip any drawing or setup if vertex_ct = 0, and set color attribute only for each line's provoking vertex. Small optimizations but these things add up.

4 years agoFix T51188 compilation errors in Windows
Dalai Felinto [Wed, 12 Apr 2017 16:58:38 +0000 (18:58 +0200)]
Fix T51188 compilation errors in Windows

4 years agoTask scheduler: Prevent race condition for the pools created from non-main thread
Sergey Sharybin [Wed, 12 Apr 2017 16:18:33 +0000 (18:18 +0200)]
Task scheduler: Prevent race condition for the pools created from non-main thread

We can not re-use anything for such pools, because we will know nothing about whether
the main thread is sleeping or not. So we identify such threads as 0, but we don't
use main thread's TLS.

This fixes dead-locks and crashes reported by Luca when doing playblasts.

4 years agoLayer / Outliner / Depsgraph: update depsgraph when running outliner operators
Dalai Felinto [Wed, 12 Apr 2017 14:55:04 +0000 (16:55 +0200)]
Layer / Outliner / Depsgraph: update depsgraph when running outliner operators

4 years agoFix T50227: Alembic uv export/load issue
Sybren A. Stüvel [Wed, 12 Apr 2017 14:33:40 +0000 (16:33 +0200)]
Fix T50227: Alembic uv export/load issue

Previously only a CD_MLOOPUV custom data layer was created. Now we also
create the accompanying CD_MTEXPOLY layer too.

4 years agoFix T51184: Crash of Blender when I try to join an object with one that has booleans...
Sergey Sharybin [Wed, 12 Apr 2017 14:12:28 +0000 (16:12 +0200)]
Fix T51184: Crash of Blender when I try to join an object with one that has booleans modifiers

4 years agoOutliner: Draw nested collections before objects of a collection
Julian Eisel [Wed, 12 Apr 2017 12:47:54 +0000 (14:47 +0200)]
Outliner: Draw nested collections before objects of a collection

Collections may contain a huge list of objects, would be annoying having
to scroll over it all the time to get to the nested collections.

4 years agoOutliner: Fix objects of master collection not showing up in 'Master Collection Tree'
Julian Eisel [Wed, 12 Apr 2017 12:45:42 +0000 (14:45 +0200)]
Outliner: Fix objects of master collection not showing up in 'Master Collection Tree'

4 years agoMerge branch 'master' into 28
Campbell Barton [Wed, 12 Apr 2017 10:23:30 +0000 (20:23 +1000)]
Merge branch 'master' into 28

4 years agoAlembic export: fixed exporting as "flat"
Sybren A. Stüvel [Wed, 12 Apr 2017 10:15:32 +0000 (12:15 +0200)]
Alembic export: fixed exporting as "flat"

This exports all objects in world coordinates without parenting.

4 years agoAlembic export: removed superfluous export_object() check.
Sybren A. Stüvel [Tue, 11 Apr 2017 12:07:26 +0000 (14:07 +0200)]
Alembic export: removed superfluous export_object() check.

The exploreTransform() function already does this check, and the check
isn't necessary when the object type isn't exported anyway.

4 years agoCleanup: use lowercase gpu prefix for static funcs
Campbell Barton [Wed, 12 Apr 2017 10:18:44 +0000 (20:18 +1000)]
Cleanup: use lowercase gpu prefix for static funcs

This was mostly followed already.

4 years agoDraw Engine: remove hard coded limit on array sizes
Campbell Barton [Wed, 12 Apr 2017 09:49:19 +0000 (19:49 +1000)]
Draw Engine: remove hard coded limit on array sizes


Actual memory saving isn't so important, it just means we don't need to
manually bump these based on changes to engines.

4 years agoRemove bool -> int cast
Campbell Barton [Wed, 12 Apr 2017 08:23:40 +0000 (18:23 +1000)]
Remove bool -> int cast

Wont work as expected on big endian systems

4 years agoColor management: Avoid memory copy into same buffer
Sergey Sharybin [Wed, 12 Apr 2017 08:23:38 +0000 (10:23 +0200)]
Color management: Avoid memory copy into same buffer

4 years agoCleanup: naming & line length
Campbell Barton [Wed, 12 Apr 2017 08:23:17 +0000 (18:23 +1000)]
Cleanup: naming & line length

4 years agoCleanup: use DRW_cache_mesh prefix w/ mesh objects
Campbell Barton [Wed, 12 Apr 2017 08:08:07 +0000 (18:08 +1000)]
Cleanup: use DRW_cache_mesh prefix w/ mesh objects

Avoid confusion for non mesh types where verts/wire/surface might apply.

Other object types use this convention already.

4 years agoEditMesh Render: remove edges-of-vert loop
Campbell Barton [Wed, 12 Apr 2017 05:42:41 +0000 (15:42 +1000)]
EditMesh Render: remove edges-of-vert loop

Replace topology check which checked edges twice
with a loop on the edge array.

4 years agoMerge branch 'master' into 28
Campbell Barton [Wed, 12 Apr 2017 04:23:47 +0000 (14:23 +1000)]
Merge branch 'master' into 28

4 years agoDocs: minor improvement to code example
Campbell Barton [Wed, 12 Apr 2017 04:21:59 +0000 (14:21 +1000)]
Docs: minor improvement to code example

4 years agoCleanup: replace char array with struct
Campbell Barton [Wed, 12 Apr 2017 04:08:44 +0000 (14:08 +1000)]
Cleanup: replace char array with struct

4 years agoEditMode: remove edge-hash from MeshRenderData
Campbell Barton [Wed, 12 Apr 2017 03:42:27 +0000 (13:42 +1000)]
EditMode: remove edge-hash from MeshRenderData

LoopTri's can access this data.

4 years agoCleanup: use const pointer for view access API
Campbell Barton [Wed, 12 Apr 2017 02:10:01 +0000 (12:10 +1000)]
Cleanup: use const pointer for view access API

4 years agoCleanup: line length
Campbell Barton [Wed, 12 Apr 2017 02:05:11 +0000 (12:05 +1000)]
Cleanup: line length

Avoid right-shift

4 years agofix compile warnings
Mike Erwin [Tue, 11 Apr 2017 23:35:30 +0000 (19:35 -0400)]
fix compile warnings

4 years agoCorrect own error in adding colors
Campbell Barton [Tue, 11 Apr 2017 14:49:05 +0000 (00:49 +1000)]
Correct own error in adding colors

Make comment regarding GLSL more clear.

4 years agoMake image drawing code working with core profile
Sergey Sharybin [Tue, 11 Apr 2017 14:30:00 +0000 (16:30 +0200)]
Make image drawing code working with core profile

The issue was caused here by usage of deprecated GL_CURRENT_PROGRAM
which was returning rubbish value.

Now we use imm API and create vertex format prior to immBindProgram.
This made us required to have some sort of state passed from setup
function to actual drawing.

4 years agoRenaming: sl > scene_layer
Dalai Felinto [Tue, 11 Apr 2017 14:49:32 +0000 (16:49 +0200)]
Renaming: sl > scene_layer

4 years agoFix blenderplayer(tm)
Dalai Felinto [Tue, 11 Apr 2017 14:24:44 +0000 (16:24 +0200)]
Fix blenderplayer(tm)

4 years agoDraw Manager: Fix blended color.
Clément Foucault [Tue, 11 Apr 2017 14:13:09 +0000 (16:13 +0200)]
Draw Manager: Fix blended color.

4 years agoDraw Manager: Fix Background sets not being drawn.
Clément Foucault [Tue, 11 Apr 2017 14:11:45 +0000 (16:11 +0200)]
Draw Manager: Fix Background sets not being drawn.

4 years agoRenaming: sl > scene_layer
Dalai Felinto [Tue, 11 Apr 2017 14:09:30 +0000 (16:09 +0200)]
Renaming: sl > scene_layer

4 years agoCleanup: remove no longer needed BASE_ defines
Dalai Felinto [Tue, 11 Apr 2017 13:51:18 +0000 (15:51 +0200)]
Cleanup: remove no longer needed BASE_ defines

4 years agoBring snapping back (Base / BaseLegacy)
Dalai Felinto [Tue, 11 Apr 2017 13:14:49 +0000 (15:14 +0200)]
Bring snapping back (Base / BaseLegacy)

4 years agoUse immediate mode API for OpenColorIO
Sergey Sharybin [Tue, 11 Apr 2017 13:28:35 +0000 (15:28 +0200)]
Use immediate mode API for OpenColorIO

4 years agoMove cage_manipulator.c to new GL code.
Bastien Montagne [Tue, 11 Apr 2017 13:16:53 +0000 (15:16 +0200)]
Move cage_manipulator.c to new GL code.

Note: I’d assume gawain equivalent to glDrawArrays would be batches? But
for two lines drawn twice this looks totally overkill anyway, so
switched back to basic immediate-mode-like API.

A bit frustrating to work on this code, since afaict you cannot check
the results in Blender, being mostly unused currently...

4 years agoFIx copy/paste mistake in own previous commit.
Bastien Montagne [Tue, 11 Apr 2017 12:30:23 +0000 (14:30 +0200)]
FIx copy/paste mistake in own previous commit.

4 years agoGL/WIP: fix crash drawing text object
Campbell Barton [Tue, 11 Apr 2017 12:46:56 +0000 (22:46 +1000)]
GL/WIP: fix crash drawing text object

Note that this doesn't set the normal as it should (noted as a TODO),
just committing to avoid the crash.

4 years agoDraw Manager: replace varargs with a pointer array
Campbell Barton [Tue, 11 Apr 2017 11:19:23 +0000 (21:19 +1000)]
Draw Manager: replace varargs with a pointer array

Allows to ensure correct number of args

4 years agoGet rid of last deprecated OpenGL calls in arrow_manipulator.c
Bastien Montagne [Tue, 11 Apr 2017 10:47:38 +0000 (12:47 +0200)]
Get rid of last deprecated OpenGL calls in arrow_manipulator.c

Hope that makes sense...

4 years agoMove arrow2d_manipulator to new immediate mode GL.
Bastien Montagne [Tue, 11 Apr 2017 10:46:49 +0000 (12:46 +0200)]
Move arrow2d_manipulator to new immediate mode GL.

4 years agoFix: width of UILayout.prop_enum() buttons
raa [Tue, 11 Apr 2017 10:25:46 +0000 (13:25 +0300)]
Fix: width of UILayout.prop_enum() buttons

4 years agoCycles: Only calculate global size of split kernel once to avoid changes
Mai Lavelle [Tue, 11 Apr 2017 07:02:43 +0000 (03:02 -0400)]
Cycles: Only calculate global size of split kernel once to avoid changes

Global size depends on memory usage which might change during rendering.
Havent seen it happen but seems possible that this could cause the global
size to be different than what was used for allocating buffers.

4 years agoCycles: Implement automatic global size for CUDA split kernel
Mai Lavelle [Tue, 11 Apr 2017 06:36:08 +0000 (02:36 -0400)]
Cycles: Implement automatic global size for CUDA split kernel

Not sure this is the best way to do things for CUDA but its much better than
being unimplemented.

4 years agoUncomment deselected center point color
Campbell Barton [Tue, 11 Apr 2017 05:48:10 +0000 (15:48 +1000)]
Uncomment deselected center point color

4 years agoDraw Manager: Add center-color for linked/multiuser objects
Campbell Barton [Tue, 11 Apr 2017 04:05:39 +0000 (14:05 +1000)]
Draw Manager: Add center-color for linked/multiuser objects

Draws a blue center circle for library objects.
As with regular drawing, this uses a hard-coded color.

4 years agoCleanup: quiet harmless but annoying overflow
Campbell Barton [Tue, 11 Apr 2017 01:48:00 +0000 (11:48 +1000)]
Cleanup: quiet harmless but annoying overflow

Caused asan to print warnings generating RNA

4 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 11 Apr 2017 00:59:31 +0000 (10:59 +1000)]
Merge branch 'master' into blender2.8

4 years agoRemove redundant glColor call
Campbell Barton [Tue, 11 Apr 2017 00:47:00 +0000 (10:47 +1000)]
Remove redundant glColor call

4 years agoCycles: Fix the AO replacement option in the split kernel
Lukas Stockner [Mon, 10 Apr 2017 22:53:31 +0000 (00:53 +0200)]
Cycles: Fix the AO replacement option in the split kernel

Currently the code for it was inside the hair-specific part, so it wouldn't be enabled in hairless renders.

4 years agoUI: Add missing UV tools in the UV/Image Editor Window > Tools tab
Aaron Carlisle [Mon, 10 Apr 2017 22:37:03 +0000 (18:37 -0400)]
UI: Add missing UV tools in the UV/Image Editor Window > Tools tab

Original Author: @xrg
Changes By @blendify

Image of patch: {F284237}

4 years agoUI: Do not put walk navigation settings inside an if statement
Aaron Carlisle [Mon, 10 Apr 2017 21:44:03 +0000 (17:44 -0400)]
UI: Do not put walk navigation settings inside an if statement

The issue here is that the preferences are still used because both can be accessed from the 3D View, view menu. In the future, it is likely that the old mode will be removed (maybe 2.8?) but for now we want to keep both operational.

Differential revision:

4 years agoObject Engine: Fix Selected Group Objects color.
Clément Foucault [Mon, 10 Apr 2017 20:23:33 +0000 (22:23 +0200)]
Object Engine: Fix Selected Group Objects color.

4 years agoObject Engine: Ported Force Field object drawing.
Clément Foucault [Mon, 10 Apr 2017 20:22:37 +0000 (22:22 +0200)]
Object Engine: Ported Force Field object drawing.