Blender Git Commit Log

OpenGL: box & circle outline functions that work with 3D position (z=0)

New immediate mode API is strict about attribute formats. These new functions make existing code easier to port.

Supports T49043

Gawain: closer integration of immediate mode & matrix APIs

- any shader program can use matrix state (not only built-in shaders)
- you can mix matrix & begin/end calls, and the bound shader will use the latest matrix state

Part of T49450 & T49043

Merge commit 'e5c32844678e292a084d6d97eb2d4ba6affc217d' into pbr-merge

Conflicts:
source/blender/gpu/shaders/gpu_shader_material.glsl

Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_fresnel.c

OpenGL: dirty bit for GPU matrix API

Have matrices changed since the most recent bind?

Part of T49450

Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047^' into pbr-merge

Merge commit '2b240b0430787814316f3b3166453c6d85b017f3' into pbr-merge

Conflicts:
release/datafiles/splash.png
release/datafiles/splash_2x.png
source/blender/gpu/CMakeLists.txt
source/blender/gpu/intern/gpu_shader.c

Alembic: only export custom data (UVs, VCols) once, on the first frame.

This would cause Alembic to throw an exception and fail exporting
animations because it was trying to recreate and overwrite the
attributes for each frame.

Merge commit '7830ec54186e8b05a366775e02c6457eb83814a3' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_texture.c

Merge commit '9269574089a742130f02c0a1184a19d94f0e665d' into pbr-online

Merge conflicts fixes include fix on ob->reflectionplane for write and
read, and a few manual fixes to account for the ID remap changes

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_draw.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_texture.c
source/blender/gpu/shaders/gpu_shader_vertex_world.glsl

updated manta files with linker fixes

Cycles: Begin moving split kernel logic into own class

The new class `DeviceSplitKernel` will handle all logic for enqueueing of
kernels and memory memory management for the split kernel. Devices that
support the split kernel will create an instance of this class and call
its methods to run the split kernel.

There's still some work to do yet to make this device independent and to
deal with tile splitting.

Get tranform manipulators type toggle to work; increase arrow line-width; cleanup

Fix T49797: Exception from scene update handler might leak external engine descriptors

This was causing memory leaks in Cycles.

Some more detailed information in the comment in the code.

Seems to be safe and nice enough for 2.78a.

Merge branch 'master' into temp-sybren-poselib

Merge branch 'master' into cycles_disney_brdf

Switching between OSL and SVM is more consistant now when using Disney
BSDF.

There were some minor differences in the OSL implementation, e.g. the
refraction roughness was missing.

immediate mode: outliner background

I tried using immRecti instead, but it didn't work. The current approach
should be more efficient anyways (since GL_TRIANGLE_FAN wouldn't work
here).

Support drawing arrow manipulators while translating

immediate mode: ed_util.c

note: I switched one of the glVertex2iv into glVertex2fv to use the same attrib_id