Diffusion Blender 49490e5cfbeb

Merge branch 'master' into blender2.8
49490e5cfbeb
Actions

Authored by Campbell Barton (campbellbarton) on Dec 12 2018, 2:55 AM.

Description

Merge branch 'master' into blender2.8

Details

Committed

Campbell Barton (campbellbarton)

Dec 12 2018, 3:02 AM

Parents

rBe757c4a3bec8: Cleanup: use colon separator after parameter
rB16fc62e15f0a: Docs: correct doxy comments

Branches

Unknown

Tags

Unknown

Event Timeline

Campbell Barton (campbellbarton) committed rB49490e5cfbeb: Merge branch 'master' into blender2.8 (authored by Campbell Barton (campbellbarton)).Dec 12 2018, 3:02 AM

Merged Changes

	Commit			Author	Details	Committed
	e757c4a3bec8			Campbell Barton (campbellbarton)	Cleanup: use colon separator after parameter	Dec 12 2018

Changes (203)

Path

Size

source/

blender/

alembic/

intern/

blenkernel/

intern/

blenlib/

intern/

blenloader/

intern/

readblenentry.c

readfile.c

writefile.c

bmesh/

intern/

operators/

tools/

bmesh_decimate_collapse.c

bmesh_decimate_unsubdivide.c

collada/

compositor/

intern/

COM_ExecutionSystem.h

operations/

COM_BokehImageOperation.h

COM_PixelateOperation.h

COM_SunBeamsOperation.cpp

draw/

engines/

gpencil/

gpencil_shader_fx.c

editors/

animation/

armature/

gpencil/

interface/

mesh/

screen/

sculpt_paint/

space_file/

space_image/

space_node/

space_outliner/

outliner_collections.c

outliner_tree.c

space_text/

text_format.c

space_view3d/

view3d_camera_control.c

view3d_edit.c

view3d_gizmo_navigate_type.c

transform/

util/

freestyle/

intern/

image/

scene_graph/

stroke/

AdvancedFunctions0D.h

AdvancedFunctions1D.h

AdvancedPredicates1D.h

AdvancedStrokeShaders.h

view_map/

gpu/

intern/

gpu_uniformbuffer.c

imbuf/

IMB_metadata.h

intern/

openexr/

openexr_api.cpp

makesdna/

intern/

dna_genfile.c

makesdna.c

makesrna/

intern/

rna_access.c

rna_define.c

modifiers/

intern/

MOD_solidify.c

MOD_util.c

physics/

intern/

ConstrainedConjugateGradient.h

python/

bmesh/

bmesh_py_ops_call.c

mathutils/

mathutils_Matrix.c

windowmanager/

gizmo/

intern/

intern/

rB49490e5cfbeb

View Options

source/blender/alembic/intern/abc_exporter.cc

View Options

source/blender/alembic/intern/abc_util.cc

View Options

source/blender/alembic/intern/alembic_capi.cc

View Options

source/blender/blenkernel/BKE_idcode.h

View Options

source/blender/blenkernel/BKE_modifier.h

View Options

source/blender/blenkernel/intern/action.c

View Options

source/blender/blenkernel/intern/anim.c

View Options

source/blender/blenkernel/intern/anim_sys.c

View Options

source/blender/blenkernel/intern/appdir.c

View Options

source/blender/blenkernel/intern/armature.c

View Options

source/blender/blenkernel/intern/autoexec.c

View Options

source/blender/blenkernel/intern/brush.c

View Options

source/blender/blenkernel/intern/bvhutils.c

View Options

source/blender/blenkernel/intern/cachefile.c

View Options

source/blender/blenkernel/intern/camera.c

View Options

source/blender/blenkernel/intern/collection.c

View Options

source/blender/blenkernel/intern/colortools.c

View Options

source/blender/blenkernel/intern/context.c

View Options

source/blender/blenkernel/intern/curve.c

View Options

source/blender/blenkernel/intern/customdata.c

View Options

source/blender/blenkernel/intern/displist.c

View Options

source/blender/blenkernel/intern/gpencil.c

View Options

source/blender/blenkernel/intern/idcode.c

View Options

source/blender/blenkernel/intern/idprop.c

View Options

source/blender/blenkernel/intern/image.c

View Options

source/blender/blenkernel/intern/key.c

View Options

source/blender/blenkernel/intern/lamp.c

View Options

source/blender/blenkernel/intern/lattice.c

View Options

source/blender/blenkernel/intern/layer.c

View Options

source/blender/blenkernel/intern/library.c

View Options

source/blender/blenkernel/intern/library_query.c

View Options

source/blender/blenkernel/intern/lightprobe.c

View Options

source/blender/blenkernel/intern/linestyle.c

View Options

source/blender/blenkernel/intern/main.c

View Options

source/blender/blenkernel/intern/mask.c

View Options

source/blender/blenkernel/intern/material.c

View Options

source/blender/blenkernel/intern/mball.c

View Options

source/blender/blenkernel/intern/mesh.c

View Options

source/blender/blenkernel/intern/mesh_evaluate.c

View Options

source/blender/blenkernel/intern/mesh_mapping.c

View Options

source/blender/blenkernel/intern/mesh_merge.c

View Options

source/blender/blenkernel/intern/mesh_validate.c

View Options

source/blender/blenkernel/intern/modifier.c

View Options

source/blender/blenkernel/intern/movieclip.c

View Options

source/blender/blenkernel/intern/nla.c

View Options

source/blender/blenkernel/intern/node.c

View Options

source/blender/blenkernel/intern/object.c

View Options

source/blender/blenkernel/intern/object_deform.c

View Options

source/blender/blenkernel/intern/paint.c

View Options

source/blender/blenkernel/intern/particle.c

View Options

source/blender/blenkernel/intern/rigidbody.c

View Options

source/blender/blenkernel/intern/scene.c

View Options

source/blender/blenkernel/intern/sound.c

View Options

source/blender/blenkernel/intern/speaker.c

View Options

source/blender/blenkernel/intern/text.c

View Options

source/blender/blenkernel/intern/texture.c

View Options

source/blender/blenkernel/intern/world.c

View Options

source/blender/blenlib/BLI_astar.h

View Options

source/blender/blenlib/BLI_system.h

View Options

source/blender/blenlib/PIL_time.h

View Options

source/blender/blenlib/intern/BLI_dynstr.c

View Options

source/blender/blenlib/intern/BLI_ghash.c

View Options

source/blender/blenlib/intern/BLI_kdtree.c

View Options

source/blender/blenlib/intern/BLI_mempool.c

View Options

source/blender/blenlib/intern/astar.c

View Options

source/blender/blenlib/intern/convexhull_2d.c

View Options

source/blender/blenlib/intern/edgehash.c

View Options

source/blender/blenlib/intern/fileops.c

View Options

source/blender/blenlib/intern/freetypefont.c

View Options

source/blender/blenlib/intern/gsqueue.c

View Options

source/blender/blenlib/intern/listbase.c

View Options

source/blender/blenlib/intern/math_base_inline.c

View Options

source/blender/blenlib/intern/math_geom.c

View Options

source/blender/blenlib/intern/math_geom_inline.c

View Options

source/blender/blenlib/intern/math_rotation.c

View Options

source/blender/blenlib/intern/math_solvers.c

View Options

source/blender/blenlib/intern/math_statistics.c

View Options

source/blender/blenlib/intern/path_util.c

View Options

source/blender/blenlib/intern/string.c

View Options

source/blender/blenlib/intern/string_utf8.c

View Options

source/blender/blenlib/intern/string_utils.c

View Options

source/blender/blenlib/intern/task.c

View Options

source/blender/blenlib/intern/timecode.c

View Options

source/blender/blenloader/intern/readblenentry.c

View Options

source/blender/blenloader/intern/readfile.c

View Options

source/blender/blenloader/intern/writefile.c

View Options

source/blender/bmesh/intern/bmesh_construct.c

View Options

source/blender/bmesh/intern/bmesh_core.c

View Options

source/blender/bmesh/intern/bmesh_mesh_conv.c

View Options

source/blender/bmesh/intern/bmesh_mods.c

View Options

source/blender/bmesh/intern/bmesh_operators.c

View Options

source/blender/bmesh/intern/bmesh_polygon.c

View Options

source/blender/bmesh/intern/bmesh_query.c

View Options

source/blender/bmesh/operators/bmo_fill_grid.c

View Options

source/blender/bmesh/operators/bmo_normals.c

View Options

source/blender/bmesh/operators/bmo_primitive.c

View Options

source/blender/bmesh/tools/bmesh_bisect_plane.c

View Options

source/blender/bmesh/tools/bmesh_decimate_collapse.c

View Options

source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c

View Options

source/blender/bmesh/tools/bmesh_edgenet.c

View Options

source/blender/bmesh/tools/bmesh_edgesplit.c

View Options

source/blender/bmesh/tools/bmesh_intersect.c

View Options

source/blender/bmesh/tools/bmesh_region_match.c

View Options

source/blender/collada/DocumentImporter.h

View Options

source/blender/compositor/COM_compositor.h

View Options

source/blender/compositor/intern/COM_CPUDevice.h

View Options

source/blender/compositor/intern/COM_Converter.h

View Options

source/blender/compositor/intern/COM_Device.h

View Options

source/blender/compositor/intern/COM_ExecutionGroup.h

View Options

source/blender/compositor/intern/COM_ExecutionSystem.h

View Options

source/blender/compositor/intern/COM_MemoryBuffer.h

View Options

source/blender/compositor/intern/COM_MemoryProxy.h

View Options

source/blender/compositor/intern/COM_Node.h

View Options

source/blender/compositor/intern/COM_NodeOperation.h

View Options

source/blender/compositor/intern/COM_OpenCLDevice.h

View Options

source/blender/compositor/intern/COM_SocketReader.h

View Options

source/blender/compositor/intern/COM_WorkPackage.h

View Options

source/blender/compositor/intern/COM_WorkScheduler.h

View Options

source/blender/compositor/operations/COM_BokehImageOperation.h

View Options

source/blender/compositor/operations/COM_PixelateOperation.h

View Options

source/blender/compositor/operations/COM_SunBeamsOperation.cpp

View Options

source/blender/draw/engines/gpencil/gpencil_shader_fx.c

View Options

source/blender/editors/animation/anim_channels_edit.c

View Options

source/blender/editors/animation/anim_markers.c

View Options

source/blender/editors/armature/armature_utils.c

View Options

source/blender/editors/armature/pose_transform.c

View Options

source/blender/editors/gpencil/editaction_gpencil.c

View Options

source/blender/editors/gpencil/gpencil_fill.c

View Options

source/blender/editors/gpencil/gpencil_intern.h

View Options

source/blender/editors/gpencil/gpencil_paint.c

View Options

source/blender/editors/gpencil/gpencil_utils.c

View Options

source/blender/editors/interface/interface.c

View Options

source/blender/editors/interface/interface_draw.c

View Options

source/blender/editors/interface/interface_handlers.c

View Options

source/blender/editors/mesh/editmesh_knife.c

View Options

source/blender/editors/mesh/editmesh_rip.c

View Options

source/blender/editors/mesh/editmesh_select.c

View Options

source/blender/editors/mesh/editmesh_utils.c

View Options

source/blender/editors/screen/area.c

View Options

source/blender/editors/sculpt_paint/sculpt.c

View Options

source/blender/editors/space_file/fsmenu.h

View Options

source/blender/editors/space_image/image_ops.c

View Options

source/blender/editors/space_node/node_edit.c

View Options

source/blender/editors/space_outliner/outliner_collections.c

View Options

source/blender/editors/space_outliner/outliner_tree.c

View Options

source/blender/editors/space_text/text_format.c

View Options

source/blender/editors/space_view3d/view3d_camera_control.c

View Options

source/blender/editors/space_view3d/view3d_edit.c

View Options

source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c

View Options

source/blender/editors/space_view3d/view3d_project.c

View Options

source/blender/editors/space_view3d/view3d_utils.c

View Options

source/blender/editors/space_view3d/view3d_view.c

View Options

source/blender/editors/space_view3d/view3d_walk.c

View Options

source/blender/editors/transform/transform.c

View Options

source/blender/editors/transform/transform_generics.c

View Options

source/blender/editors/util/ed_util.c

View Options

source/blender/freestyle/intern/image/GaussianFilter.h

View Options

source/blender/freestyle/intern/image/Image.h

View Options

source/blender/freestyle/intern/image/ImagePyramid.h

View Options

source/blender/freestyle/intern/scene_graph/FrsMaterial.h

View Options

source/blender/freestyle/intern/scene_graph/NodeCamera.h

View Options

source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h

View Options

source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h

View Options

source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h

View Options

source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h

View Options

source/blender/freestyle/intern/stroke/BasicStrokeShaders.h

View Options

source/blender/freestyle/intern/stroke/Canvas.h

View Options

source/blender/freestyle/intern/stroke/Chain.h

View Options

source/blender/freestyle/intern/stroke/ChainingIterators.h

View Options

source/blender/freestyle/intern/stroke/ContextFunctions.h

View Options

source/blender/freestyle/intern/stroke/Curve.h

View Options

source/blender/freestyle/intern/stroke/Operators.h

View Options

source/blender/freestyle/intern/stroke/Predicates0D.h

View Options

source/blender/freestyle/intern/stroke/Predicates1D.h

View Options

source/blender/freestyle/intern/stroke/Stroke.h

View Options

source/blender/freestyle/intern/stroke/StrokeShader.h

View Options

source/blender/freestyle/intern/view_map/FEdgeXDetector.h

View Options

source/blender/freestyle/intern/view_map/Functions0D.h

View Options

source/blender/freestyle/intern/view_map/Functions1D.h

View Options

source/blender/freestyle/intern/view_map/Interface1D.h

View Options

source/blender/freestyle/intern/view_map/Silhouette.h

View Options

source/blender/freestyle/intern/view_map/SteerableViewMap.h

View Options

source/blender/freestyle/intern/view_map/ViewMap.h

View Options

source/blender/freestyle/intern/view_map/ViewMapIterators.h

View Options

source/blender/gpu/intern/gpu_uniformbuffer.c

View Options

source/blender/imbuf/IMB_metadata.h

View Options

source/blender/imbuf/intern/openexr/openexr_api.cpp

View Options

source/blender/makesdna/intern/dna_genfile.c

View Options

source/blender/makesdna/intern/makesdna.c

View Options

source/blender/makesrna/intern/rna_access.c

View Options

source/blender/makesrna/intern/rna_define.c

View Options

source/blender/modifiers/intern/MOD_solidify.c

View Options

source/blender/modifiers/intern/MOD_util.c

View Options

source/blender/physics/intern/ConstrainedConjugateGradient.h

View Options

source/blender/python/bmesh/bmesh_py_ops_call.c

View Options

source/blender/python/mathutils/mathutils_Matrix.c

View Options

source/blender/windowmanager/gizmo/intern/wm_gizmo.c

View Options

source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c

View Options

source/blender/windowmanager/intern/wm.c

View Options

source/blender/windowmanager/intern/wm_cursors.c

View Options

source/blender/windowmanager/intern/wm_event_system.c

View Options

source/blender/windowmanager/intern/wm_operators.c

View Options

source/blender/windowmanager/intern/wm_window.c

Merge branch 'master' into blender2.849490e5cfbebActions

Description

Details

Event Timeline

Merged Changes

Changes (203)

rB49490e5cfbeb

source/blender/alembic/intern/abc_exporter.cc

source/blender/alembic/intern/abc_util.cc

source/blender/alembic/intern/alembic_capi.cc

source/blender/blenkernel/BKE_idcode.h

source/blender/blenkernel/BKE_modifier.h

source/blender/blenkernel/intern/action.c

source/blender/blenkernel/intern/anim.c

source/blender/blenkernel/intern/anim_sys.c

source/blender/blenkernel/intern/appdir.c

source/blender/blenkernel/intern/armature.c

source/blender/blenkernel/intern/autoexec.c

source/blender/blenkernel/intern/brush.c

source/blender/blenkernel/intern/bvhutils.c

source/blender/blenkernel/intern/cachefile.c

source/blender/blenkernel/intern/camera.c

source/blender/blenkernel/intern/collection.c

source/blender/blenkernel/intern/colortools.c

source/blender/blenkernel/intern/context.c

source/blender/blenkernel/intern/curve.c

source/blender/blenkernel/intern/customdata.c

source/blender/blenkernel/intern/displist.c

source/blender/blenkernel/intern/gpencil.c

source/blender/blenkernel/intern/idcode.c

source/blender/blenkernel/intern/idprop.c

source/blender/blenkernel/intern/image.c

source/blender/blenkernel/intern/key.c

source/blender/blenkernel/intern/lamp.c

source/blender/blenkernel/intern/lattice.c

source/blender/blenkernel/intern/layer.c

source/blender/blenkernel/intern/library.c

source/blender/blenkernel/intern/library_query.c

source/blender/blenkernel/intern/lightprobe.c

source/blender/blenkernel/intern/linestyle.c

source/blender/blenkernel/intern/main.c

source/blender/blenkernel/intern/mask.c

source/blender/blenkernel/intern/material.c

source/blender/blenkernel/intern/mball.c

source/blender/blenkernel/intern/mesh.c

source/blender/blenkernel/intern/mesh_evaluate.c

source/blender/blenkernel/intern/mesh_mapping.c

source/blender/blenkernel/intern/mesh_merge.c

source/blender/blenkernel/intern/mesh_validate.c

source/blender/blenkernel/intern/modifier.c

source/blender/blenkernel/intern/movieclip.c

source/blender/blenkernel/intern/nla.c

source/blender/blenkernel/intern/node.c

source/blender/blenkernel/intern/object.c

source/blender/blenkernel/intern/object_deform.c

source/blender/blenkernel/intern/paint.c

source/blender/blenkernel/intern/particle.c

source/blender/blenkernel/intern/rigidbody.c

source/blender/blenkernel/intern/scene.c

source/blender/blenkernel/intern/sound.c

source/blender/blenkernel/intern/speaker.c

source/blender/blenkernel/intern/text.c

source/blender/blenkernel/intern/texture.c

source/blender/blenkernel/intern/world.c

source/blender/blenlib/BLI_astar.h

source/blender/blenlib/BLI_system.h

source/blender/blenlib/PIL_time.h

source/blender/blenlib/intern/BLI_dynstr.c

source/blender/blenlib/intern/BLI_ghash.c

source/blender/blenlib/intern/BLI_kdtree.c

source/blender/blenlib/intern/BLI_mempool.c

source/blender/blenlib/intern/astar.c

source/blender/blenlib/intern/convexhull_2d.c

source/blender/blenlib/intern/edgehash.c

source/blender/blenlib/intern/fileops.c

source/blender/blenlib/intern/freetypefont.c

source/blender/blenlib/intern/gsqueue.c

source/blender/blenlib/intern/listbase.c

source/blender/blenlib/intern/math_base_inline.c

source/blender/blenlib/intern/math_geom.c

Merge branch 'master' into blender2.8
49490e5cfbeb
Actions