Diffusion Blender 253dce07d7cc

Merge branch 'master' into blender2.8
253dce07d7cc
Actions

Authored by Brecht Van Lommel (brecht) on Sep 24 2018, 5:41 PM.

Tags

None

Subscribers

None

Description

Merge branch 'master' into blender2.8

Details

Committed

Brecht Van Lommel (brecht)

Sep 24 2018, 5:42 PM

Parents

rB0cff044d8464: Spelling fixes in comments and descriptions, patch by luzpaz.
rBfe52a05e950e: Modifiers: use Mesh instead of DerivedMesh for dynamic paint.

Branches

Unknown

Tags

Unknown

Event Timeline

Brecht Van Lommel (brecht) committed rB253dce07d7cc: Merge branch 'master' into blender2.8 (authored by Brecht Van Lommel (brecht)).Sep 24 2018, 5:42 PM

Merged Changes

	Commit			Author	Details	Committed
	0cff044d8464		D3719	Brecht Van Lommel (brecht)	Spelling fixes in comments and descriptions, patch by luzpaz.	Sep 24 2018
	ea61700a2d3b			Sergey Sharybin (sergey)	Tracking: Use pixel aspect from clip	Sep 24 2018
	24330f679e39			Lukas Stockner (lukasstockner97)	Fix T56875: Auto Render not working after render pass name refactor	Sep 24 2018

Changes (111)

Path

Size

source/

blender/

avi/

intern/

blenkernel/

BKE_customdata.h

BKE_dynamicpaint.h

BKE_library_query.h

BKE_pointcache.h

intern/

CCGSubSurf_intern.h

data_transfer.c

library_remap.c

mask_rasterize.c

mesh_evaluate.c

mesh_validate.c

particle_system.c

tracking_region_tracker.c

collada/

AnimationExporter.cpp

ControllerExporter.cpp

MeshImporter.cpp

SceneExporter.cpp

collada_utils.cpp

compositor/

intern/

COM_Converter.cpp

COM_ExecutionGroup.cpp

COM_MemoryProxy.h

nodes/

COM_DilateErodeNode.h

operations/

COM_FastGaussianBlurOperation.cpp

COM_ScaleOperation.cpp

COM_SunBeamsOperation.cpp

COM_VectorBlurOperation.cpp

depsgraph/

intern/

builder/

deg_builder_relations.cc

deg_builder_relations.h

depsgraph_types.h

gpu/

intern/

makesdna/

DNA_armature_types.h

DNA_constraint_types.h

DNA_gpencil_types.h

DNA_mask_types.h

DNA_modifier_types.h

DNA_object_fluidsim_types.h

DNA_particle_types.h

DNA_rigidbody_types.h

DNA_sequence_types.h

DNA_smoke_types.h

DNA_space_types.h

DNA_tracking_types.h

DNA_userdef_types.h

DNA_windowmanager_types.h

intern/

makesrna/

intern/

rna_linestyle.c

rna_object_api.c

rna_object_force.c

nodes/

composite/

nodes/

node_composite_image.c

physics/

intern/

BPH_mass_spring.cpp

ConstrainedConjugateGradient.h

implicit_blender.c

windowmanager/

intern/

wm_event_system.c

wm_files_link.c

rB253dce07d7cc

source/blender/avi/intern/avi.c

Loading...

source/blender/blenkernel/BKE_action.h

Loading...

source/blender/blenkernel/BKE_armature.h

Loading...

source/blender/blenkernel/BKE_bvhutils.h

Loading...

source/blender/blenkernel/BKE_customdata.h

Loading...

source/blender/blenkernel/BKE_dynamicpaint.h

Loading...

source/blender/blenkernel/BKE_editmesh.h

Loading...

source/blender/blenkernel/BKE_gpencil.h

Loading...

source/blender/blenkernel/BKE_library_query.h

Loading...

source/blender/blenkernel/BKE_pointcache.h

Loading...

source/blender/blenkernel/BKE_unit.h

Loading...

source/blender/blenkernel/intern/CCGSubSurf_intern.h

Loading...

source/blender/blenkernel/intern/DerivedMesh.c

Loading...

source/blender/blenkernel/intern/action.c

Loading...

source/blender/blenkernel/intern/anim.c

Loading...

source/blender/blenkernel/intern/boids.c

Loading...

source/blender/blenkernel/intern/brush.c

Loading...

source/blender/blenkernel/intern/cloth.c

Loading...

source/blender/blenkernel/intern/constraint.c

Loading...

source/blender/blenkernel/intern/context.c

Loading...

source/blender/blenkernel/intern/curve.c

Loading...

source/blender/blenkernel/intern/customdata.c

Loading...

source/blender/blenkernel/intern/data_transfer.c

Loading...

source/blender/blenkernel/intern/dynamicpaint.c

Loading...

source/blender/blenkernel/intern/fmodifier.c

Loading...

source/blender/blenkernel/intern/font.c

Loading...

source/blender/blenkernel/intern/image.c

Loading...

source/blender/blenkernel/intern/ipo.c

Loading...

source/blender/blenkernel/intern/library.c

Loading...

source/blender/blenkernel/intern/library_remap.c

Loading...

source/blender/blenkernel/intern/mask_rasterize.c

Loading...

source/blender/blenkernel/intern/mesh.c

Loading...

source/blender/blenkernel/intern/mesh_convert.c

Loading...

source/blender/blenkernel/intern/mesh_evaluate.c

Loading...

source/blender/blenkernel/intern/mesh_mapping.c

Loading...

source/blender/blenkernel/intern/mesh_remap.c

Loading...

source/blender/blenkernel/intern/mesh_validate.c

Loading...

source/blender/blenkernel/intern/modifier.c

Loading...

source/blender/blenkernel/intern/nla.c

Loading...

source/blender/blenkernel/intern/node.c

Loading...

source/blender/blenkernel/intern/object.c

Loading...

source/blender/blenkernel/intern/object_dupli.c

Loading...

source/blender/blenkernel/intern/packedFile.c

Loading...

source/blender/blenkernel/intern/particle_system.c

Loading...

source/blender/blenkernel/intern/pointcache.c

Loading...

source/blender/blenkernel/intern/report.c

Loading...

source/blender/blenkernel/intern/seqeffects.c

Loading...

source/blender/blenkernel/intern/sequencer.c

Loading...

source/blender/blenkernel/intern/shrinkwrap.c

Loading...

source/blender/blenkernel/intern/smoke.c

Loading...

source/blender/blenkernel/intern/softbody.c

Loading...

source/blender/blenkernel/intern/subsurf_ccg.c

Loading...

source/blender/blenkernel/intern/text.c

Loading...

source/blender/blenkernel/intern/tracking.c

Loading...

source/blender/blenkernel/intern/tracking_region_tracker.c

Loading...

source/blender/blenkernel/intern/unit.c

Loading...

source/blender/collada/AnimationExporter.cpp

Loading...

source/blender/collada/ControllerExporter.cpp

Loading...

source/blender/collada/MeshImporter.cpp

Loading...

source/blender/collada/SceneExporter.cpp

Loading...

source/blender/collada/collada_utils.cpp

Loading...

source/blender/compositor/intern/COM_Converter.cpp

Loading...

source/blender/compositor/intern/COM_ExecutionGroup.cpp

Loading...

source/blender/compositor/intern/COM_MemoryProxy.h

Loading...

source/blender/compositor/nodes/COM_DilateErodeNode.h

Loading...

source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp

Loading...

source/blender/compositor/operations/COM_ScaleOperation.cpp

Loading...

source/blender/compositor/operations/COM_SunBeamsOperation.cpp

Loading...

source/blender/compositor/operations/COM_VectorBlurOperation.cpp

Loading...

source/blender/depsgraph/intern/builder/deg_builder_relations.cc

Loading...

source/blender/depsgraph/intern/builder/deg_builder_relations.h

Loading...

source/blender/depsgraph/intern/depsgraph.cc

Loading...

source/blender/depsgraph/intern/depsgraph_types.h

Loading...

source/blender/gpu/intern/gpu_shader.c

Loading...

source/blender/makesdna/DNA_ID.h

Loading...

source/blender/makesdna/DNA_armature_types.h

Loading...

source/blender/makesdna/DNA_constraint_types.h

Loading...

source/blender/makesdna/DNA_gpencil_types.h

Loading...

source/blender/makesdna/DNA_mask_types.h

Loading...

source/blender/makesdna/DNA_modifier_types.h

Loading...

source/blender/makesdna/DNA_object_fluidsim_types.h

Loading...

source/blender/makesdna/DNA_particle_types.h

Loading...

source/blender/makesdna/DNA_rigidbody_types.h

Loading...

source/blender/makesdna/DNA_sequence_types.h

Loading...

source/blender/makesdna/DNA_smoke_types.h

Loading...

source/blender/makesdna/DNA_space_types.h

Loading...

source/blender/makesdna/DNA_tracking_types.h

Loading...

source/blender/makesdna/DNA_userdef_types.h

Loading...

source/blender/makesdna/DNA_windowmanager_types.h

Loading...

source/blender/makesdna/intern/dna_genfile.c

Loading...

source/blender/makesdna/intern/makesdna.c

Loading...

source/blender/makesrna/RNA_types.h

Loading...

source/blender/makesrna/intern/rna_armature.c

Loading...

source/blender/makesrna/intern/rna_gpencil.c

Loading...

source/blender/makesrna/intern/rna_lattice.c

Loading...

source/blender/makesrna/intern/rna_linestyle.c

Loading...

source/blender/makesrna/intern/rna_object.c

Loading...

source/blender/makesrna/intern/rna_object_api.c

Loading...

source/blender/makesrna/intern/rna_object_force.c

Loading...

source/blender/nodes/composite/nodes/node_composite_image.c

Loading...

source/blender/physics/intern/BPH_mass_spring.cpp

Loading...

source/blender/physics/intern/ConstrainedConjugateGradient.h

Loading...

source/blender/physics/intern/implicit_blender.c

Loading...

source/blender/windowmanager/intern/wm_cursors.c

Loading...

source/blender/windowmanager/intern/wm_event_system.c

Loading...

source/blender/windowmanager/intern/wm_files.c

Loading...

source/blender/windowmanager/intern/wm_files_link.c

Loading...

source/blender/windowmanager/intern/wm_jobs.c

Loading...

source/blender/windowmanager/intern/wm_keymap.c

Loading...

source/blender/windowmanager/intern/wm_operators.c

Loading...

source/blender/windowmanager/intern/wm_window.c

Loading...