[Bf-blender-cvs] [0cb77853cb5] newboolean: Merge master to newboolean.
Howard Trickey
noreply at git.blender.org
Tue Aug 27 16:54:06 CEST 2019
Commit: 0cb77853cb519b6dd5b124f473dcc133cfbe714c
Author: Howard Trickey
Date: Tue Aug 27 08:41:11 2019 -0600
Branches: newboolean
https://developer.blender.org/rB0cb77853cb519b6dd5b124f473dcc133cfbe714c
Merge master to newboolean.
===================================================================
M .clang-format
M build_files/build_environment/install_deps.sh
M build_files/cmake/platform/platform_win32.cmake
M extern/glew/CMakeLists.txt
M extern/lzma/CMakeLists.txt
M intern/cycles/blender/blender_curves.cpp
M intern/cycles/blender/blender_object.cpp
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_session.h
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_util.h
M intern/cycles/bvh/bvh.cpp
M intern/cycles/bvh/bvh.h
M intern/cycles/bvh/bvh2.cpp
M intern/cycles/bvh/bvh2.h
M intern/cycles/bvh/bvh4.cpp
M intern/cycles/bvh/bvh4.h
M intern/cycles/bvh/bvh8.cpp
M intern/cycles/bvh/bvh8.h
M intern/cycles/bvh/bvh_embree.cpp
M intern/cycles/bvh/bvh_embree.h
M intern/cycles/device/device_memory.cpp
M intern/cycles/device/device_memory.h
M intern/cycles/graph/node.h
M intern/cycles/kernel/CMakeLists.txt
M intern/cycles/kernel/bvh/bvh.h
M intern/cycles/kernel/bvh/bvh_nodes.h
M intern/cycles/kernel/geom/geom_object.h
M intern/cycles/kernel/kernel_accumulate.h
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_compat_cuda.h
M intern/cycles/kernel/kernel_compat_opencl.h
M intern/cycles/kernel/kernel_emission.h
M intern/cycles/kernel/kernel_jitter.h
M intern/cycles/kernel/kernel_light.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_path.h
M intern/cycles/kernel/kernel_path_branched.h
M intern/cycles/kernel/kernel_path_surface.h
M intern/cycles/kernel/kernel_path_volume.h
M intern/cycles/kernel/kernel_random.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/kernel_subsurface.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/kernel_volume.h
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/kernel/osl/osl_services.h
M intern/cycles/kernel/shaders/CMakeLists.txt
M intern/cycles/kernel/shaders/node_object_info.osl
M intern/cycles/kernel/shaders/node_vector_math.osl
A intern/cycles/kernel/shaders/node_white_noise_texture.osl
M intern/cycles/kernel/split/kernel_direct_lighting.h
M intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
M intern/cycles/kernel/svm/svm.h
M intern/cycles/kernel/svm/svm_ao.h
M intern/cycles/kernel/svm/svm_attribute.h
M intern/cycles/kernel/svm/svm_bevel.h
M intern/cycles/kernel/svm/svm_brick.h
M intern/cycles/kernel/svm/svm_brightness.h
M intern/cycles/kernel/svm/svm_checker.h
M intern/cycles/kernel/svm/svm_clamp.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/kernel/svm/svm_color_util.h
M intern/cycles/kernel/svm/svm_displace.h
M intern/cycles/kernel/svm/svm_fresnel.h
M intern/cycles/kernel/svm/svm_geometry.h
M intern/cycles/kernel/svm/svm_gradient.h
M intern/cycles/kernel/svm/svm_hsv.h
M intern/cycles/kernel/svm/svm_ies.h
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/kernel/svm/svm_light_path.h
M intern/cycles/kernel/svm/svm_magic.h
M intern/cycles/kernel/svm/svm_map_range.h
M intern/cycles/kernel/svm/svm_math.h
M intern/cycles/kernel/svm/svm_math_util.h
M intern/cycles/kernel/svm/svm_musgrave.h
M intern/cycles/kernel/svm/svm_noise.h
M intern/cycles/kernel/svm/svm_noisetex.h
M intern/cycles/kernel/svm/svm_ramp.h
M intern/cycles/kernel/svm/svm_tex_coord.h
M intern/cycles/kernel/svm/svm_types.h
M intern/cycles/kernel/svm/svm_vector_transform.h
M intern/cycles/kernel/svm/svm_voronoi.h
M intern/cycles/kernel/svm/svm_voxel.h
M intern/cycles/kernel/svm/svm_wave.h
A intern/cycles/kernel/svm/svm_white_noise.h
M intern/cycles/kernel/svm/svm_wireframe.h
M intern/cycles/render/bake.cpp
M intern/cycles/render/constant_fold.cpp
M intern/cycles/render/constant_fold.h
M intern/cycles/render/integrator.cpp
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
M intern/cycles/render/nodes.cpp
M intern/cycles/render/nodes.h
M intern/cycles/render/object.cpp
M intern/cycles/render/object.h
M intern/cycles/subd/subd_dice.cpp
M intern/cycles/subd/subd_split.cpp
M intern/cycles/test/render_graph_finalize_test.cpp
M intern/cycles/util/util_defines.h
M intern/cycles/util/util_hash.h
M intern/cycles/util/util_math.h
M intern/cycles/util/util_math_float3.h
M intern/cycles/util/util_system.cpp
M intern/iksolver/CMakeLists.txt
M intern/libmv/CMakeLists.txt
M intern/libmv/libmv/tracking/track_region.cc
M intern/libmv/libmv/tracking/track_region.h
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_con_action.dat
A release/datafiles/blender_icons16/icon16_seq_strip_duplicate.dat
A release/datafiles/blender_icons16/icon16_seq_strip_meta.dat
A release/datafiles/blender_icons32/icon32_con_action.dat
A release/datafiles/blender_icons32/icon32_seq_strip_duplicate.dat
A release/datafiles/blender_icons32/icon32_seq_strip_meta.dat
M release/datafiles/locale
M release/datafiles/userdef/userdef_default.c
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/modules/console/complete_import.py
A release/scripts/modules/rna_manual_reference.py
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_output.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_graph.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_nla.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M release/scripts/startup/nodeitems_builtins.py
D release/windows/installer/00.checked.bmp
D release/windows/installer/00.header.bmp
D release/windows/installer/00.installer.ico
D release/windows/installer/00.sconsblender.nsi
D release/windows/installer/01.installer.bmp
M source/blender/alembic/intern/abc_mball.h
M source/blender/alembic/intern/abc_mesh.h
M source/blender/alembic/intern/abc_util.h
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_anim.h
M source/blender/blenkernel/BKE_animsys.h
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/BKE_blender_undo.h
M source/blender/blenkernel/BKE_brush.h
M source/blender/blenkernel/BKE_bvhutils.h
M source/blender/blenkernel/BKE_cachefile.h
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/BKE_cloth.h
M source/blender/blenkernel/BKE_collection.h
M source/blender/blenkernel/BKE_collision.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_displist.h
M source/blender/blenkernel/BKE_dynamicpaint.h
M source/blender/blenkernel/BKE_editmesh.h
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_image_save.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/BKE_library.h
M source/blender/blenkernel/BKE_library_remap.h
M source/blender/blenkernel/BKE_light.h
M source/blender/blenkernel/BKE_linestyle.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_mask.h
M source/blender/blenkernel/BKE_mball.h
M source/blender/blenkernel/BKE_mball_tessellate.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_mesh_iterators.h
M source/blender/blenkernel/BKE_mesh_runtime.h
M source/blender/blenkernel/BKE_mesh_tangent.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_shader_fx.h
M source/blender/blenkernel/BKE_shrinkwrap.h
M source/blender/blenkernel/BKE_studiolight.h
M source/blender/blenkernel/BKE_subdiv.h
M source/blender/blenkernel/BKE_texture.h
M source/blender/blenkernel/BKE_tracking.h
M source/blender/blenkernel/BKE_workspace.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/bvhutils.c
M source/blender/blenkernel/intern/crazyspace.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/editmesh_bvh.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/library_override.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/mesh_mapping.c
M source/blender/blenkernel/intern/mesh_merge.c
M source/blender/blenkernel/intern/mesh_remap.c
M source/blender/blenkernel/intern/multires_reshape.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/studiolight.c
M source/blender/blenkernel/intern/undo_system.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenkernel/nla_private.h
M source/blender/blenlib/BLI_dynstr.h
M source/blender/blenlib/BLI_kdopbvh.h
M source/blender/blenlib/BLI_listbase.h
M source/blender/blenlib/BLI_memiter.h
M source/blender/blenlib/BLI_path_util.h
M source/blender/blenlib/BLI_system.h
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/math_color.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/system.c
M source/blender/blenloader/BLO_readfile.h
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_cycles.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_query.h
M source/blender/collada/AnimationExporter.h
M source/blender/collada/CMakeLists.txt
M source/blender/collada/ControllerExporter.h
M source/blender/collada/GeometryExporter.h
M source/blender/collada/collada.h
M source/blender/collada/collada_utils.h
M source/blender/compositor/nodes/COM_MixNode.cpp
M source/blender/compositor/operations/COM_DenoiseOperation.cpp
M source/blender/compositor/operations/COM_DenoiseOperation.h
M source/blender/compositor/operations/COM_MixOperation.cpp
M source/blender/compositor/operations/COM_MixOperation.h
M source/blender/depsgraph/DEG_depsgraph.h
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/depsgraph/DEG_depsgraph_query.h
M source/blender/depsgraph/intern/builder/deg_builder_cache.cc
M source/blender/depsgraph/intern/builder/deg_builder_map.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_rna.cc
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/depsgraph/intern/node/deg_node.h
M source/blender/depsgraph/intern/node/deg_node_id.h
M source/blender/depsgraph/intern/node/deg_node_operation.h
M source/blender/draw/CMakeLists.txt
M source/blender/draw/DRW_engine.h
M source/blender/draw/DRW_select_buffer.h
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/draw/engines/eevee/eevee_lightcache.h
M source/blender/draw/engines/eevee/eevee_lut.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl
M source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache_extract_mesh.c
M source/blender/draw/intern/draw_cache_impl.h
M source/blender/draw/intern/draw_cache_impl_displist.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_instance_data.h
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager.h
M source/blender/draw/intern/draw_manager_data.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/modes/object_mode.c
A source/blender/draw/modes/shaders/object_color_axes_vert.glsl
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_ipo_utils.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/armature_utils.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/curve/editcurve_select.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_clip.h
M source/blender/editors/include/ED_gizmo_library.h
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/ED_image.h
M source/blender/editors/include/ED_keyframes_draw.h
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/include/ED_markers.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_sculpt.h
M source/blender/editors/include/ED_time_scrub_ui.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/ED_transform_snap_object_context.h
M source/blender/editors/include/ED_uvedit.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_anim.c
M source/blender/editors/interface/interface_context_menu.c
M source/blender/editors/interface/interface_eyedropper_datablock.c
M source/blender/editors/interface/interface_eyedropper_driver.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_region_tooltip.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_utils.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/mask/mask_shapekey.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_polybuild.c
M source/blender/editors/mesh/editmesh_preselect_elem.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/mesh/editmesh_utils.c
M source/blender/editors/mesh/mesh_data.c
M source/blender/editors/mesh/mesh_intern.h
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_constraint.c
A source/blender/editors/object/object_data_transform.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_remesh.c
M source/blender/editors/object/object_shader_fx.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/physics/physics_intern.h
M source/blender/editors/physics/physics_pointcache.c
M source/blender/editors/render/render_intern.h
M source/blender/editors/render/render_shading.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/editors/space_action/action_data.c
M source/blender/editors/space_action/action_draw.c
M source/blender/editors/space_action/action_intern.h
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/buttons_ops.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/editors/space_clip/clip_dopesheet_draw.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_graph/graph_intern.h
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/image_intern.h
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_info/textview.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_nla/space_nla.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_select.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_gizmo_camera.c
M source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/editors/uvedit/uvedit_intern.h
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/freestyle/FRS_freestyle.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPU_batch_presets.h
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/GPU_shader_interface.h
M source/blender/gpu/GPU_texture.h
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_codegen.h
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_material.c
A source/blender/gpu/intern/gpu_material_library.h
M source/blender/gpu/intern/gpu_private.h
M source/blender/gpu/intern/gpu_shader_interface.c
M source/blender/gpu/shaders/gpu_shader_keyframe_diamond_vert.glsl
M source/blender/gpu/shaders/gpu_shader_material.glsl
A source/blender/gpu/shaders/gpu_shader_material_hash.glsl
A source/blender/gpu/shaders/gpu_shader_material_magic.glsl
A source/blender/gpu/shaders/gpu_shader_material_white_noise.glsl
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/allocimbuf.c
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_light_types.h
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_fluidsim_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/DNA_world_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_types.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access.c
A source/blender/makesrna/intern/rna_access_compare_override.c
A source/blender/makesrna/intern/rna_access_internal.h
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_armature.c
M source/blender/makesrna/intern/rna_boid.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_cloth.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_dynamicpaint.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_fluidsim.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_image.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_internal_types.h
M source/blender/makesrna/intern/rna_key.c
M source/blender/makesrna/intern/rna_lattice.c
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_light.c
M source/blender/makesrna/intern/rna_lightprobe.c
M source/blender/makesrna/intern/rna_linestyle.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_mesh_api.c
M source/blender/makesrna/intern/rna_meta.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_movieclip.c
M source/blender/makesrna/intern/rna_nla.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_screen.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_shader_fx.c
M source/blender/makesrna/intern/rna_smoke.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_texture.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/makesrna/intern/rna_ui.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_vfont.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/makesrna/intern/rna_wm_gizmo.c
M source/blender/makesrna/intern/rna_workspace.c
M source/blender/makesrna/intern/rna_world.c
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_fluidsim_util.c
M source/blender/modifiers/intern/MOD_fluidsim_util.h
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/modifiers/intern/MOD_util.h
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_shader.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/composite/nodes/node_composite_denoise.c
M source/blender/nodes/composite/nodes/node_composite_outputFile.c
M source/blender/nodes/composite/nodes/node_composite_switchview.c
M source/blender/nodes/intern/node_socket.c
M source/blender/nodes/intern/node_util.c
M source/blender/nodes/intern/node_util.h
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/nodes/shader/nodes/node_shader_normal_map.c
M source/blender/nodes/shader/nodes/node_shader_object_info.c
A source/blender/nodes/shader/nodes/node_shader_tex_white_noise.c
D source/blender/nodes/shader/nodes/node_shader_vectMath.c
A source/blender/nodes/shader/nodes/node_shader_vector_math.c
A source/blender/nodes/shader/nodes/node_shader_volume_info.c
M source/blender/physics/BPH_mass_spring.h
M source/blender/physics/intern/implicit.h
M source/blender/python/intern/bpy_interface.c
M source/blender/python/intern/bpy_msgbus.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/bpy_rna_anim.c
M source/blender/python/intern/bpy_rna_driver.c
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/extern/include/RE_render_ext.h
M source/blender/render/extern/include/RE_shader_ext.h
M source/blender/render/intern/source/bake_api.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
M source/blender/windowmanager/gizmo/wm_gizmo_fn.h
M source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
M source/blender/windowmanager/message_bus/wm_message_bus.h
M source/blender/windowmanager/wm_window.h
M source/tools
M tests/python/modules/render_report.py
===================================================================
diff --git a/.clang-format b/.clang-format
index bbbe3f1bac4..b81403c46ce 100644
--- a/.clang-format
+++ b/.clang-format
@@ -224,7 +224,9 @@ ForEachMacros:
- LISTBASE_CIRCULAR_BACKWARD_BEGIN
- LISTBASE_CIRCULAR_FORWARD_BEGIN
- LISTBASE_FOREACH
+ - LISTBASE_FOREACH_BACKWARD
- LISTBASE_FOREACH_MUTABLE
+ - LISTBASE_FOREACH_BACKWARD_MUTABLE
- MAN2D_ITER_AXES_BEGIN
- MAN_ITER_AXES_BEGIN
- NODE_INSTANCE_HASH_ITER
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index a9118be93c7..9ab460ee00f 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1974,7 +1974,8 @@ compile_OSL() {
cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
cmake_d="$cmake_d -D USE_SIMD=sse2"
- cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
+ cmake_d="$cmake_d -D USE_LLVM_BITCODE=OFF"
+ cmake_d="$cmake_d -D USE_PARTIO=OFF"
#~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
@@ -2682,6 +2683,8 @@ compile_OIDN() {
INFO "Own OpenImageDenoise-$OIDN_VERSION is up to date, nothing to do!"
INFO "If you want to force rebuild of this lib, use the --force-oidn option."
fi
+
+ run_ldconfig "oidn"
}
#### Build FFMPEG ####
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 42ac285f88d..b2277c440fe 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -135,8 +135,8 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
endif()
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /ZI")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd /ZI")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index e0773d828ec..18ca88e6fec 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -18,6 +18,13 @@
# All rights reserved.
# ***** END GPL LICENSE BLOCK *****
+# avoid noisy warnings
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+ add_c_flag(
+ "-Wno-strict-prototypes"
+ )
+endif()
+
set(INC
include
)
diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt
index 8bdddf0aced..d76b418fd74 100644
--- a/extern/lzma/CMakeLists.txt
+++ b/extern/lzma/CMakeLists.txt
@@ -18,6 +18,13 @@
# All rights reserved.
# ***** END GPL LICENSE BLOCK *****
+# avoid noisy warnings
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+ add_c_flag(
+ "-Wno-self-assign"
+ )
+endif()
+
set(INC
.
)
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index 29a1408d85d..4dba8ffbe0e 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -656,7 +656,7 @@ static void ExportCurveSegments(Scene *scene, Mesh *mesh, ParticleCurveData *CDa
}
if (attr_random != NULL) {
- attr_random->add(hash_int_01(num_curves));
+ attr_random->add(hash_uint2_to_float(num_curves, 0));
}
mesh->add_curve(num_keys, CData->psys_shader[sys]);
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 7ccf8226e5b..b670922ac88 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -217,7 +217,7 @@ void BlenderSync::sync_light(BL::Object &b_parent,
light->random_id = random_id;
}
else {
- light->random_id = hash_int_2d(hash_string(b_ob.name().c_str()), 0);
+ light->random_id = hash_uint2(hash_string(b_ob.name().c_str()), 0);
}
if (light->type == LIGHT_AREA)
@@ -444,6 +444,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
if (object_updated || (object->mesh && object->mesh->need_update) || tfm != object->tfm) {
object->name = b_ob.name().c_str();
object->pass_id = b_ob.pass_index();
+ object->color = get_float3(b_ob.color());
object->tfm = tfm;
object->motion.clear();
@@ -490,7 +491,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
else {
object->dupli_generated = make_float3(0.0f, 0.0f, 0.0f);
object->dupli_uv = make_float2(0.0f, 0.0f);
- object->random_id = hash_int_2d(hash_string(object->name.c_str()), 0);
+ object->random_id = hash_uint2(hash_string(object->name.c_str()), 0);
}
object->tag_update(scene);
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index d38a97dc4ea..8923450c469 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -114,11 +114,6 @@ BlenderSession::~BlenderSession()
free_session();
}
-void BlenderSession::create()
-{
- create_session();
-}
-
void BlenderSession::create_session()
{
SessionParams session_params = BlenderSync::get_session_params(
@@ -199,8 +194,12 @@ void BlenderSession::reset_session(BL::BlendData &b_data, BL::Depsgraph &b_depsg
height = render_resolution_y(b_render);
}
- if (session == NULL) {
- create();
+ bool is_new_session = (session == NULL);
+ if (is_new_session) {
+ /* Initialize session and remember it was just created so not to
+ * re-create it below.
+ */
+ create_session();
}
if (b_v3d) {
@@ -219,8 +218,10 @@ void BlenderSession::reset_session(BL::BlendData &b_data, BL::Depsgraph &b_depsg
/* if scene or session parameters changed, it's easier to simply re-create
* them rather than trying to distinguish which settings need to be updated
*/
- free_session();
- create_session();
+ if (!is_new_session) {
+ free_session();
+ create_session();
+ }
return;
}
@@ -539,8 +540,8 @@ void BlenderSession::render(BL::Depsgraph &b_depsgraph_)
/* Make sure all views have different noise patterns. - hardcoded value just to make it random
*/
if (view_index != 0) {
- scene->integrator->seed += hash_int_2d(scene->integrator->seed,
- hash_int(view_index * 0xdeadbeef));
+ scene->integrator->seed += hash_uint2(scene->integrator->seed,
+ hash_uint2(view_index * 0xdeadbeef, 0));
scene->integrator->tag_update(scene);
}
@@ -1481,8 +1482,8 @@ void BlenderSession::update_resumable_tile_manager(int num_samples)
/* Round after doing the multiplications with num_chunks and num_samples_per_chunk
* to allow for many small chunks. */
- int rounded_range_start_sample = (int)floor(range_start_sample + 0.5f);
- int rounded_range_num_samples = max((int)floor(range_num_samples + 0.5f), 1);
+ int rounded_range_start_sample = (int)floorf(range_start_sample + 0.5f);
+ int rounded_range_num_samples = max((int)floorf(range_num_samples + 0.5f), 1);
/* Make sure we don't overshoot. */
if (rounded_range_start_sample + rounded_range_num_samples > num_samples) {
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index d57ebe76b82..7445fb53458 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -49,8 +49,6 @@ class BlenderSession {
~BlenderSession();
- void create();
-
/* session */
void create_session();
void free_session();
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 626a1dad7db..720f521c589 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -333,9 +333,9 @@ static ShaderNode *add_node(Scene *scene,
}
else if (b_node.is_a(&RNA_ShaderNodeVectorMath)) {
BL::ShaderNodeVectorMath b_vector_math_node(b_node);
- VectorMathNode *vmath = new VectorMathNode();
- vmath->type = (NodeVectorMath)b_vector_math_node.operation();
- node = vmath;
+ VectorMathNode *vector_math_node = new VectorMathNode();
+ vector_math_node->type = (NodeVectorMathType)b_vector_math_node.operation();
+ node = vector_math_node;
}
else if (b_node.is_a(&RNA_ShaderNodeVectorTransform)) {
BL::ShaderNodeVectorTransform b_vector_transform_node(b_node);
@@ -607,6 +607,9 @@ static ShaderNode *add_node(Scene *scene,
else if (b_node.is_a(&RNA_ShaderNodeHairInfo)) {
node = new HairInfoNode();
}
+ else if (b_node.is_a(&RNA_ShaderNodeVolumeInfo)) {
+ node = new VolumeInfoNode();
+ }
else if (b_node.is_a(&RNA_ShaderNodeBump)) {
BL::ShaderNodeBump b_bump_node(b_node);
BumpNode *bump = new BumpNode();
@@ -844,6 +847,12 @@ static ShaderNode *add_node(Scene *scene,
}
node = ies;
}
+ else if (b_node.is_a(&RNA_ShaderNodeTexWhiteNoise)) {
+ BL::ShaderNodeTexWhiteNoise b_tex_white_noise_node(b_node);
+ WhiteNoiseTextureNode *white_noise_node = new WhiteNoiseTextureNode();
+ white_noise_node->dimensions = b_tex_white_noise_node.dimensions();
+ node = white_noise_node;
+ }
else if (b_node.is_a(&RNA_ShaderNodeNormalMap)) {
BL::ShaderNodeNormalMap b_normal_map_node(b_node);
NormalMapNode *nmap = new NormalMapNode();
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index bac571b02ce..aec21887088 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -255,13 +255,13 @@ void BlenderSync::sync_integrator()
integrator->seed = get_int(cscene, "seed");
if (get_boolean(cscene, "use_animated_seed")) {
- integrator->seed = hash_int_2d(b_scene.frame_current(), get_int(cscene, "seed"));
+ integrator->seed = hash_uint2(b_scene.frame_current(), get_int(cscene, "seed"));
if (b_scene.frame_subframe() != 0.0f) {
/* TODO(sergey): Ideally should be some sort of hash_merge,
* but this is good enough for no
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list