This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne a35e733ff1 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

..

CMakeLists.txt

Face Maps: custom-data, UI and RNA API

2017-05-30 18:05:59 +10:00

object_add.c

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

object_bake_api.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_bake.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_constraint.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_data_transfer.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_edit.c

Woarkspace: Remove residue of hidden type

2017-06-13 12:02:08 +02:00

object_facemap_ops.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_group.c

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

object_hook.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_intern.h

Rename probe to light-probe

2017-06-12 21:34:55 +10:00

object_lattice.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_lod.c

Cleanup: unused headers

2014-11-28 15:52:30 +01:00

object_modifier.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_ops.c

Rename probe to light-probe

2017-06-12 21:34:55 +10:00

object_random.c

Fix T44821: Making warp shortcut fails

2015-05-26 17:55:34 +10:00

object_relations.c

Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +02:00

object_select.c

Woarkspace: Remove residue of hidden type

2017-06-13 12:02:08 +02:00

object_shapekey.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_transform.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_vgroup.c

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

object_warp.c

Math Lib: rotate matrix cleanup

2016-11-25 16:39:34 +11:00