Blender Git Loki

Git Commits -> Revision dcae89e

Revision dcae89e by Rohan Rathi
September 5, 2017, 13:21 (GMT)
Revert deviation from master

Commit Details:

Full Hash: dcae89e002b49f94fc199f38c81d5cbf8194f517
Parent Commit: efd5180
Lines Changed: +5375, -2021

10 Added Paths:

/diff (+0, -0)
/release/scripts/presets/ffmpeg/DVD_(note_colon__this_changes_render_resolution).py (+24, -0) (View)
/release/scripts/presets/ffmpeg/h264_in_Matroska.py (+17, -0) (View)
/release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py (+14, -0) (View)
/release/scripts/presets/ffmpeg/h264_in_MP4.py (+18, -0) (View)
/source/blender/blenlib/BLI_variadic_defines.h (+50, -0) (View)
/source/blender/editors/include/ED_transform.h.orig (+195, -0) (View)
/source/blender/editors/transform/transform.h.orig (+823, -0) (View)
/source/blender/editors/transform/transform_ops.c.orig (+1243, -0) (View)
/tests/gtests/blenlib/stubs/bf_intern_eigen_stubs.h (+18, -0) (View)

4 Deleted Paths:

/release/scripts/presets/ffmpeg/DVD (note_colon_ this changes render resolution).py (+0, -24)
/release/scripts/presets/ffmpeg/h264 in Matroska for scrubbing.py (+0, -14)
/release/scripts/presets/ffmpeg/h264 in Matroska.py (+0, -17)
/release/scripts/presets/ffmpeg/h264 in MP4.py (+0, -18)

247 Modified Paths:

/build_files/buildbot/master.cfg (+7, -9) (Diff)
/build_files/build_environment/cmake/options.cmake (+2, -2) (Diff)
/build_files/cmake/cmake_consistency_check.py (+1, -3) (Diff)
/build_files/cmake/project_info.py (+2, -4) (Diff)
/CMakeLists.txt (+1, -1) (Diff)
/doc/python_api/sphinx_doc_gen.py (+2, -1) (Diff)
/intern/atomic/atomic_ops.h (+1, -0) (Diff)
/intern/atomic/intern/atomic_ops_ext.h (+11, -0) (Diff)
/intern/atomic/intern/atomic_ops_utils.h (+2, -2) (Diff)
/intern/audaspace/intern/AUD_SoftwareDevice.cpp (+1, -1) (Diff)
/intern/cycles/blender/addon/presets.py (+1, -0) (Diff)
/intern/cycles/blender/addon/properties.py (+6, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+113, -94) (Diff)
/intern/cycles/blender/addon/version_update.py (+0, -20) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+16, -12) (Diff)
/intern/cycles/blender/blender_object.cpp (+12, -2) (Diff)
/intern/cycles/blender/blender_python.cpp (+2, -0) (Diff)
/intern/cycles/blender/blender_sync.cpp (+41, -14) (Diff)
/intern/cycles/bvh/bvh4.cpp (+12, -12) (Diff)
/intern/cycles/bvh/bvh_build.cpp (+4, -2) (Diff)
/intern/cycles/bvh/bvh_node.cpp (+11, -0) (Diff)
/intern/cycles/bvh/bvh_node.h (+1, -0) (Diff)
/intern/cycles/device/device_cpu.cpp (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+21, -5) (Diff)
/intern/cycles/device/device_network.cpp (+0, -1) (Diff)
/intern/cycles/device/device_opencl.cpp (+27, -1) (Diff)
/intern/cycles/kernel/bvh/bvh_nodes.h (+1, -1) (Diff)
/intern/cycles/kernel/filter/filter_prefilter.h (+47, -40) (Diff)
/intern/cycles/kernel/kernel_bake.h (+24, -31) (Diff)
/intern/cycles/kernel/kernel_emission.h (+3, -3) (Diff)
/intern/cycles/kernel/kernel_light.h (+11, -22) (Diff)
/intern/cycles/kernel/kernel_passes.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+29, -38) (Diff)
/intern/cycles/kernel/kernel_path_branched.h (+26, -33) (Diff)
/intern/cycles/kernel/kernel_path_common.h (+4, -4) (Diff)
/intern/cycles/kernel/kernel_path_state.h (+3, -2) (Diff)
/intern/cycles/kernel/kernel_path_subsurface.h (+3, -5) (Diff)
/intern/cycles/kernel/kernel_path_surface.h (+15, -19) (Diff)
/intern/cycles/kernel/kernel_path_volume.h (+19, -22) (Diff)
/intern/cycles/kernel/kernel_random.h (+33, -32) (Diff)
/intern/cycles/kernel/kernel_shader.h (+25, -18) (Diff)
/intern/cycles/kernel/kernel_shadow.h (+2, -4) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_types.h (+3, -20) (Diff)
/intern/cycles/kernel/kernel_volume.h (+9, -12) (Diff)
/intern/cycles/kernel/osl/osl_globals.h (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+3, -2) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+10, -14) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+4, -4) (Diff)
/intern/cycles/kernel/split/kernel_branched.h (+4, -3) (Diff)
/intern/cycles/kernel/split/kernel_buffer_update.h (+17, -26) (Diff)
/intern/cycles/kernel/split/kernel_direct_lighting.h (+3, -6) (Diff)
/intern/cycles/kernel/split/kernel_do_volume.h (+6, -10) (Diff)
/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h (+8, -17) (Diff)
/intern/cycles/kernel/split/kernel_next_iteration_setup.h (+1, -4) (Diff)
/intern/cycles/kernel/split/kernel_path_init.h (+9, -16) (Diff)
/intern/cycles/kernel/split/kernel_scene_intersect.h (+1, -2) (Diff)
/intern/cycles/kernel/split/kernel_shader_eval.h (+4, -12) (Diff)
/intern/cycles/kernel/split/kernel_shadow_blocked_ao.h (+2, -5) (Diff)
/intern/cycles/kernel/split/kernel_shadow_blocked_dl.h (+4, -8) (Diff)
/intern/cycles/kernel/split/kernel_split_data_types.h (+0, -2) (Diff)
/intern/cycles/kernel/split/kernel_subsurface_scatter.h (+6, -14) (Diff)
/intern/cycles/render/graph.cpp (+3, -22) (Diff)
/intern/cycles/render/graph.h (+1, -2) (Diff)
/intern/cycles/render/image.cpp (+8, -0) (Diff)
/intern/cycles/render/nodes.cpp (+9, -3) (Diff)
/intern/cycles/render/nodes.h (+10, -16) (Diff)
/intern/cycles/render/osl.cpp (+13, -15) (Diff)
/intern/cycles/render/shader.cpp (+2, -14) (Diff)
/intern/cycles/render/shader.h (+1, -5) (Diff)
/intern/cycles/render/svm.cpp (+15, -23) (Diff)
/intern/cycles/render/svm.h (+0, -3) (Diff)
/intern/cycles/util/util_atomic.h (+0, -10) (Diff)
/intern/cycles/util/util_debug.cpp (+3, -0) (Diff)
/intern/cycles/util/util_debug.h (+3, -0) (Diff)
/intern/cycles/util/util_math.h (+9, -2) (Diff)
/intern/cycles/util/util_simd.h (+11, -3) (Diff)
/intern/cycles/util/util_stats.h (+1, -1) (Diff)
/intern/cycles/util/util_time.h (+6, -1) (Diff)
/intern/guardedalloc/intern/mallocn_lockfree_impl.c (+1, -6) (Diff)
/intern/mikktspace/mikktspace.c (+41, -21) (Diff)
/make.bat (+84, -50) (Diff)
/release/scripts/modules/bpy/utils/__init__.py (+19, -0) (Diff)
/release/scripts/modules/rna_info.py (+33, -2) (Diff)
/release/scripts/startup/bl_ui/properties_animviz.py (+5, -5) (Diff)
/release/scripts/startup/bl_ui/properties_data_armature.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_data_lamp.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+5, -4) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_game.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_grease_pencil_common.py (+26, -26) (Diff)
/release/scripts/startup/bl_ui/properties_paint_common.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+5, -5) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+4, -4) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+4, -4) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+5, -5) (Diff)
/release/scripts/startup/bl_ui/space_outliner.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+16, -16) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+9, -9) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+4, -3) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+1, -1) (Diff)
/release/text/copyright.txt (+1, -1) (Diff)
/source/blender/alembic/intern/abc_util.cc (+3, -3) (Diff)
/source/blender/alembic/intern/alembic_capi.cc (+4, -0) (Diff)
/source/blender/blenkernel/BKE_curve.h (+0, -3) (Diff)
/source/blender/blenkernel/BKE_image.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+2, -1) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/constraint.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/curve.c (+0, -11) (Diff)
/source/blender/blenkernel/intern/icons.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/image.c (+13, -1) (Diff)
/source/blender/blenkernel/intern/key.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/library_remap.c (+10, -2) (Diff)
/source/blender/blenkernel/intern/material.c (+8, -0) (Diff)
/source/blender/blenkernel/intern/mesh.c (+66, -122) (Diff)
/source/blender/blenkernel/intern/mesh_evaluate.c (+80, -6) (Diff)
/source/blender/blenkernel/intern/node.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/object_deform.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+6, -0) (Diff)
/source/blender/blenkernel/intern/particle_distribute.c (+1, -5) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+11, -1) (Diff)
/source/blender/blenkernel/intern/texture.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/tracking_util.c (+2, -0) (Diff)
/source/blender/blenlib/BLI_dial.h (+2, -2) (Diff)
/source/blender/blenlib/BLI_ghash.h (+2, -0) (Diff)
/source/blender/blenlib/BLI_kdtree.h (+4, -0) (Diff)
/source/blender/blenlib/BLI_rect.h (+2, -0) (Diff)
/source/blender/blenlib/BLI_string_utils.h (+19, -0) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+1, -24) (Diff)
/source/blender/blenlib/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenlib/intern/BLI_dial.c (+2, -2) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+34, -0) (Diff)
/source/blender/blenlib/intern/BLI_kdtree.c (+120, -0) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+3, -0) (Diff)
/source/blender/blenlib/intern/rct.c (+38, -0) (Diff)
/source/blender/blenlib/intern/string_utils.c (+88, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -0) (Diff)
/source/blender/bmesh/intern/bmesh_mesh_conv.c (+107, -93) (Diff)
/source/blender/bmesh/operators/bmo_removedoubles.c (+35, -64) (Diff)
/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp (+40, -37) (Diff)
/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h (+4, -2) (Diff)
/source/blender/compositor/operations/COM_ScaleOperation.cpp (+2, -2) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+6, -14) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+107, -63) (Diff)
/source/blender/depsgraph/intern/depsgraph_tag.cc (+7, -1) (Diff)
/source/blender/depsgraph/intern/depsgraph_types.h (+0, -3) (Diff)
/source/blender/depsgraph/intern/depsgraph_type_defines.cc (+0, -1) (Diff)
/source/blender/editors/animation/anim_filter.c (+2, -0) (Diff)
/source/blender/editors/animation/keyingsets.c (+2, -0) (Diff)
/source/blender/editors/gpencil/editaction_gpencil.c (+4, -2) (Diff)
/source/blender/editors/gpencil/gpencil_interpolate.c (+9, -4) (Diff)
/source/blender/editors/include/ED_transform.h (+2, -1) (Diff)
/source/blender/editors/include/UI_view2d.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_ops.c (+3, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+1, -1) (Diff)
/source/blender/editors/interface/view2d.c (+8, -0) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+4, -4) (Diff)
/source/blender/editors/object/object_add.c (+5, -0) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/object/object_edit.c (+6, -3) (Diff)
/source/blender/editors/object/object_transform.c (+24, -9) (Diff)
/source/blender/editors/object/object_vgroup.c (+3, -0) (Diff)
/source/blender/editors/render/render_shading.c (+2, -0) (Diff)
/source/blender/editors/screen/screen_context.c (+26, -1) (Diff)
/source/blender/editors/space_action/action_select.c (+2, -0) (Diff)
/source/blender/editors/space_node/node_relationships.c (+7, -6) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+6, -1) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+2, -0) (Diff)
/source/blender/editors/space_time/space_time.c (+2, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+7, -0) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+11, -7) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+9, -0) (Diff)
/source/blender/editors/transform/transform.c (+39, -15) (Diff)
/source/blender/editors/transform/transform.h (+3, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+12, -3) (Diff)
/source/blender/editors/transform/transform_ops.c (+19, -8) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+10, -7) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+6, -4) (Diff)
/source/blender/makesrna/intern/rna_access.c (+84, -0) (Diff)
/source/blender/makesrna/intern/rna_animation.c (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_define.c (+55, -20) (Diff)
/source/blender/makesrna/intern/rna_image.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_internal_types.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_key.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -3) (Diff)
/source/blender/makesrna/intern/rna_rna.c (+9, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_ui.c (+32, -3) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+2, -4) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+78, -104) (Diff)
/source/blender/makesrna/RNA_access.h (+3, -0) (Diff)
/source/blender/makesrna/RNA_define.h (+2, -2) (Diff)
/source/blender/makesrna/RNA_types.h (+2, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_fresnel.c (+14, -5) (Diff)
/source/blender/nodes/shader/nodes/node_shader_layer_weight.c (+14, -5) (Diff)
/source/blender/python/bmesh/bmesh_py_ops_call.c (+14, -29) (Diff)
/source/blender/python/bmesh/bmesh_py_types.c (+34, -44) (Diff)
/source/blender/python/bmesh/bmesh_py_types_customdata.c (+3, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.c (+5, -6) (Diff)
/source/blender/python/generic/idprop_py_api.c (+3, -3) (Diff)
/source/blender/python/generic/python_utildefines.h (+3, -3) (Diff)
/source/blender/python/generic/py_capi_utils.c (+138, -40) (Diff)
/source/blender/python/generic/py_capi_utils.h (+40, -3) (Diff)
/source/blender/python/intern/bpy_app.c (+2, -3) (Diff)
/source/blender/python/intern/bpy_app_alembic.c (+4, -2) (Diff)
/source/blender/python/intern/bpy_app_ffmpeg.c (+3, -2) (Diff)
/source/blender/python/intern/bpy_app_ocio.c (+4, -3) (Diff)
/source/blender/python/intern/bpy_app_oiio.c (+4, -3) (Diff)
/source/blender/python/intern/bpy_app_opensubdiv.c (+4, -3) (Diff)
/source/blender/python/intern/bpy_app_openvdb.c (+4, -3) (Diff)
/source/blender/python/intern/bpy_app_sdl.c (+4, -2) (Diff)
/source/blender/python/intern/bpy_library_load.c (+2, -2) (Diff)
/source/blender/python/intern/bpy_props.c (+10, -22) (Diff)
/source/blender/python/intern/bpy_rna.c (+11, -16) (Diff)
/source/blender/python/intern/bpy_rna_array.c (+3, -1) (Diff)
/source/blender/python/intern/gpu_offscreen.c (+2, -32) (Diff)
/source/blender/python/mathutils/mathutils_bvhtree.c (+2, -2) (Diff)
/source/blender/python/mathutils/mathutils_geometry.c (+1, -1) (Diff)
/source/blender/python/mathutils/mathutils_Matrix.c (+67, -0) (Diff)
/source/blender/python/mathutils/mathutils_Matrix.h (+5, -0) (Diff)
/source/blender/python/mathutils/mathutils_Vector.c (+3, -1) (Diff)
/source/blender/windowmanager/intern/wm.c (+4, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+45, -34) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+42, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/source/blender/windowmanager/wm_event_system.h (+2, -1) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+1, -0) (Diff)
/tests/check_deprecated.py (+2, -4) (Diff)
/tests/gtests/blenlib/BLI_kdopbvh_test.cc (+2, -0) (Diff)
/tests/gtests/blenlib/BLI_math_geom_test.cc (+2, -0) (Diff)
/tests/gtests/blenlib/BLI_polyfill2d_test.cc (+2, -0) (Diff)
/tests/gtests/blenlib/CMakeLists.txt (+16, -13) (Diff)
/tests/python/batch_import.py (+2, -4) (Diff)
/tests/python/bl_load_py_modules.py (+2, -3) (Diff)
/tests/python/bl_run_operators.py (+2, -4) (Diff)
/tests/python/CMakeLists.txt (+2, -0) (Diff)
/tests/python/cycles_render_tests.py (+44, -18) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021