blender-archive

Archived

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.

Files

History

Bastien Montagne 9b4e56c091 Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_camera.h
	source/blender/blenkernel/BKE_dynamicpaint.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/intern/camera.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/physics/dynamicpaint_ops.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-05-31 12:57:24 +02:00

CMakeLists.txt

Modifiers: ported Surface Deform to Mesh

2018-05-09 12:17:24 +02:00

object_add.c

Cleanup: Reuse existing scene pointer

2018-05-30 16:46:11 +02:00

object_bake_api.c

Cycles/Render API: changes for better copy-on-write support.

2018-05-23 13:21:02 +02:00

object_bake.c

Cleanup: fix compiler warnings on macOS / clang.