Bastien Montagne 1bcf9217eb Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_pointcache.h
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/editors/include/ED_particle.h
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_edit_undo.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/physics/physics_intern.h
	source/blender/editors/physics/physics_pointcache.c
	source/blender/editors/space_time/space_time.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_generics.c
	source/blender/editors/transform/transform_manipulator.c
	source/blender/makesrna/intern/rna_object.c
	source/blender/makesrna/intern/rna_object_force.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-06-13 15:36:24 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-06-13 15:36:24 +02:00

creator

--debug-gpu-shader: Dump GLSL shaders to disk

2018-06-02 20:29:27 +02:00

tools @ 9d7d338cb2

UI: initial support for parent panels in popovers

2018-06-09 14:21:39 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00