Blender Git Commit Log

Git Commits -> Revision 0aa824c

August 6, 2019, 17:44 (GMT)
GPencil: Revert wrong merge of LANPR branch

Due to an error, the code of LANPR branch was merged accidentally to the Grease Pencil branch.

This commit reverts all work to the last correct commit.

The command executed was: `git diff ff7482286319e7b462b98dc26909b47d9d661ec6 | patch -p1 -R`

Thanks to @dfelinto for fixing the error.

Commit Details:

Full Hash: 0aa824cad2bf1b0715551425076bbc2156153190
Parent Commit: 7356e92
Lines Changed: +1168, -21388

36 Deleted Paths:

/bvhtree (+0, -0)
/mesh (+0, -0)
/release/scripts/startup/bl_operators/lanpr.py (+0, -46)
/release/scripts/startup/bl_ui/properties_collection.py (+0, -119)
/release/scripts/startup/bl_ui/properties_lanpr.py (+0, -146)
/source/blender/draw/engines/lanpr/lanpr_access.h (+0, -38)
/source/blender/draw/engines/lanpr/lanpr_all.h (+0, -261)
/source/blender/draw/engines/lanpr/lanpr_chain_draw.c (+0, -167)
/source/blender/draw/engines/lanpr/lanpr_cpu.c (+0, -514)
/source/blender/draw/engines/lanpr/lanpr_dpix.c (+0, -550)
/source/blender/draw/engines/lanpr/lanpr_engine.c (+0, -838)
/source/blender/draw/engines/lanpr/lanpr_snake.c (+0, -596)
/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl (+0, -6)
/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl (+0, -193)
/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl (+0, -495)
/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl (+0, -6)
/source/blender/draw/engines/lanpr/shaders/lanpr_snake_edge_frag.glsl (+0, -88)
/source/blender/draw/engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl (+0, -329)
/source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl (+0, -6)
/source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl (+0, -114)
/source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl (+0, -10)
/source/blender/draw/engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl (+0, -19)
/source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl (+0, -291)
/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl (+0, -185)
/source/blender/draw/engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl (+0, -21)
/source/blender/editors/include/ED_lanpr.h (+0, -835)
/source/blender/editors/lanpr/CMakeLists.txt (+0, -43)
/source/blender/editors/lanpr/lanpr_chain.c (+0, -768)
/source/blender/editors/lanpr/lanpr_ops.c (+0, -4495)
/source/blender/editors/lanpr/lanpr_util.c (+0, -1051)
/source/blender/makesdna/DNA_lanpr_types.h (+0, -134)
/source/blender/makesrna/intern/rna_lanpr.c (+0, -221)
/source/blender/modifiers/intern/MOD_featureline.c (+0, -131)
/source/blender/modifiers/intern/MOD_mybmesh.c (+0, -4799)
/v (+0, -0)
/x (+0, -0)

137 Modified Paths:

/intern/opensubdiv/internal/opensubdiv_evaluator.cc (+0, -16) (Diff)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc (+0, -91) (Diff)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h (+0, -10) (Diff)
/intern/opensubdiv/opensubdiv_evaluator_capi.h (+0, -11) (Diff)
/release/scripts/startup/bl_operators/__init__.py (+0, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_armature.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_bone.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_camera.py (+14, -14) (Diff)
/release/scripts/startup/bl_ui/properties_data_curve.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_lattice.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_light.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+9, -9) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+14, -71) (Diff)
/release/scripts/startup/bl_ui/properties_data_speaker.py (+4, -4) (Diff)
/release/scripts/startup/bl_ui/properties_grease_pencil_common.py (+0, -1) (Diff)
/release/scripts/startup/bl_ui/properties_material.py (+4, -26) (Diff)
/release/scripts/startup/bl_ui/properties_material_gpencil.py (+4, -6) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+3, -2) (Diff)
/release/scripts/startup/bl_ui/properties_output.py (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+50, -50) (Diff)
/release/scripts/startup/bl_ui/properties_physics_cloth.py (+11, -11) (Diff)
/release/scripts/startup/bl_ui/properties_physics_common.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+21, -21) (Diff)
/release/scripts/startup/bl_ui/properties_physics_field.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+9, -9) (Diff)
/release/scripts/startup/bl_ui/properties_physics_rigidbody.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py (+13, -13) (Diff)
/release/scripts/startup/bl_ui/properties_physics_softbody.py (+15, -15) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+3, -465) (Diff)
/release/scripts/startup/bl_ui/properties_scene.py (+5, -189) (Diff)
/release/scripts/startup/bl_ui/properties_view_layer.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/properties_world.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+15, -2) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+14, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+12, -12) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+0, -2) (Diff)
/source/blender/blenfont/BLF_api.h (+0, -1) (Diff)
/source/blender/blenfont/intern/blf_thumbs.c (+1, -2) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+3, -3) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+0, -16) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -2) (Diff)
/source/blender/blenkernel/intern/armature.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/customdata.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/data_transfer.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+0, -359) (Diff)
/source/blender/blenkernel/intern/gpencil_modifier.c (+0, -84) (Diff)
/source/blender/blenkernel/intern/scene.c (+0, -36) (Diff)
/source/blender/blenkernel/intern/subdiv_mesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/tracking_stabilize.c (+5, -8) (Diff)
/source/blender/blenlib/BLI_math_base.h (+0, -1) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+0, -2) (Diff)
/source/blender/blenlib/intern/math_base_inline.c (+0, -5) (Diff)
/source/blender/blenlib/intern/math_vector.c (+0, -17) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -51) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+0, -54) (Diff)
/source/blender/blenloader/intern/writefile.c (+0, -9) (Diff)
/source/blender/blentranslation/CMakeLists.txt (+0, -1) (Diff)
/source/blender/blentranslation/intern/blt_lang.c (+0, -3) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+1, -2) (Diff)
/source/blender/draw/CMakeLists.txt (+0, -22) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.c (+1, -0) (Diff)
/source/blender/draw/engines/gpencil/gpencil_render.c (+1, -1) (Diff)
/source/blender/draw/engines/gpencil/gpencil_shader_fx.c (+2, -1) (Diff)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl (+1, -5) (Diff)
/source/blender/draw/intern/draw_cache_impl_mesh.c (+6, -3) (Diff)
/source/blender/draw/intern/draw_manager.c (+1, -4) (Diff)
/source/blender/draw/intern/draw_manager_texture.c (+0, -33) (Diff)
/source/blender/draw/intern/DRW_render.h (+0, -11) (Diff)
/source/blender/draw/modes/object_mode.c (+0, -3) (Diff)
/source/blender/editors/CMakeLists.txt (+0, -1) (Diff)
/source/blender/editors/gpencil/annotate_paint.c (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_brush.c (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+392, -184) (Diff)
/source/blender/editors/gpencil/gpencil_intern.h (+6, -3) (Diff)
/source/blender/editors/gpencil/gpencil_merge.c (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_ops.c (+0, -1) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+1, -1) (Diff)
/source/blender/editors/include/ED_svg.h (+2, -7) (Diff)
/source/blender/editors/io/CMakeLists.txt (+0, -3) (Diff)
/source/blender/editors/io/io_svg.c (+0, -86) (Diff)
/source/blender/editors/io/io_svg.h (+2, -7) (Diff)
/source/blender/editors/mesh/editmesh_path.c (+13, -7) (Diff)
/source/blender/editors/mesh/editmesh_select_similar.c (+8, -8) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+22, -23) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+4, -2) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+6, -3) (Diff)
/source/blender/editors/object/object_hook.c (+3, -7) (Diff)
/source/blender/editors/render/render_intern.h (+0, -19) (Diff)
/source/blender/editors/render/render_ops.c (+0, -18) (Diff)
/source/blender/editors/render/render_update.c (+0, -5) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+0, -1) (Diff)
/source/blender/editors/space_action/action_select.c (+1, -6) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+0, -35) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+0, -6) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+155, -61) (Diff)
/source/blender/editors/space_clip/clip_graph_ops.c (+19, -34) (Diff)
/source/blender/editors/space_clip/clip_intern.h (+24, -33) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+25, -153) (Diff)
/source/blender/editors/space_clip/tracking_ops_solve.c (+0, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+0, -3) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+0, -1) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+4, -4) (Diff)
/source/blender/editors/transform/transform_conversions.c (+0, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+2, -2) (Diff)
/source/blender/gpencil_modifiers/CMakeLists.txt (+0, -3) (Diff)
/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c (+8, -19) (Diff)
/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c (+9, -12) (Diff)
/source/blender/imbuf/IMB_thumbs.h (+5, -12) (Diff)
/source/blender/imbuf/intern/thumbs_font.c (+9, -25) (Diff)
/source/blender/makesdna/DNA_collection_types.h (+0, -46) (Diff)
/source/blender/makesdna/DNA_customdata_types.h (+4, -4) (Diff)
/source/blender/makesdna/DNA_material_types.h (+0, -18) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+0, -56) (Diff)
/source/blender/makesdna/DNA_object_types.h (+0, -13) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -89) (Diff)
/source/blender/makesdna/DNA_space_types.h (+0, -2) (Diff)
/source/blender/makesdna/intern/makesdna.c (+0, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+67, -69) (Diff)
/source/blender/makesrna/intern/makesrna.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_collection.c (+0, -84) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_material.c (+0, -120) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+6, -6) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+0, -164) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -36) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+0, -373) (Diff)
/source/blender/makesrna/intern/rna_space.c (+0, -14) (Diff)
/source/blender/makesrna/RNA_access.h (+0, -7) (Diff)
/source/blender/modifiers/CMakeLists.txt (+66, -69) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+1, -39) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+0, -2) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+0, -2) (Diff)
/source/blender/python/bmesh/bmesh_py_types_customdata.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+0, -5) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021