Bastien Montagne 45f3150c98 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_view3d/drawobject.c

2017-04-10 17:34:31 +02:00

..

animation

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

armature

Gawain: VertexFormat_add_attrib (function name change)

2017-04-06 01:18:12 -04:00

curve

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

datafiles

Remove SCons building system

2016-01-04 14:20:48 +05:00

gpencil

GPencil 2D Drawing: get rid of PRIM_QUAD_XXX.

2017-04-10 16:54:21 +02:00

include

OpenGL: remove UI_reinit_gl_state function

2017-04-07 15:10:48 -04:00

interface

First batch of PRIM_QUAD_XXX replacement by PRIM_TRIANGLES.

2017-04-10 15:17:26 +02:00

io

Fix collada exporting for Blender 2.8

2017-04-04 17:45:55 +02:00

mask

Gawain: VertexFormat_add_attrib (function name change)

2017-04-06 01:18:12 -04:00

mesh

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

metaball

3D View: new nethod of opengl selection

2017-03-09 06:22:02 +11:00

object

GPULamp: Separate GPULamp from GPUMaterial

2017-04-03 21:52:03 +02:00

physics

3D View: manipulator from custom-manipulators branch

2017-04-07 21:23:32 +10:00

render

Depsgraph: Remove all layer bit flags related checks

2017-04-05 11:39:30 +02:00

screen

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

sculpt_paint

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

sound

Depsgraph: Remove all layer bit flags related checks

2017-04-05 11:39:30 +02:00

space_action

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_api

OpenGL: remove UI_reinit_gl_state function

2017-04-07 15:10:48 -04:00

space_buttons

Prevent crash on weight paint

2017-03-30 11:25:53 +02:00

space_clip

Merge branch 'master' into blender2.8

2017-04-10 16:53:12 +02:00

space_console

Gawain: VertexFormat_add_attrib (function name change)

2017-04-06 01:18:12 -04:00

space_file

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_graph

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_image

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_info

Gawain: VertexFormat_add_attrib (function name change)

2017-04-06 01:18:12 -04:00

space_logic

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

space_nla

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_node

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_outliner

First batch of PRIM_QUAD_XXX replacement by PRIM_TRIANGLES.

2017-04-10 15:17:26 +02:00

space_script

Remove SCons building system

2016-01-04 14:20:48 +05:00

space_sequencer

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_text

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

space_time

First batch of PRIM_QUAD_XXX replacement by PRIM_TRIANGLES.

2017-04-10 15:17:26 +02:00

space_userpref

Remove SCons building system

2016-01-04 14:20:48 +05:00

space_view3d

Merge branch 'master' into blender2.8

2017-04-10 17:34:31 +02:00

transform

Correct constraint manipulator colors

2017-04-08 12:08:51 +10:00

util

OpenGL: use PRIM instead of GL enum for immBegin

2017-04-07 16:31:26 -04:00

uvedit

OpenGL: use PRIM instead of GL enum everywhere else

2017-04-08 01:19:48 -04:00

CMakeLists.txt

Revert "Collection Editor based on patch by Julian Eisel"

2017-02-15 18:17:34 +01:00