Blender Git Loki
Git Commits -> Revision 6ae9dd0
August 9, 2019, 11:59 (GMT) |
GPencil: More merge errors All these errors are related to the problem when merge the LANPR branch to GPencil branch by error. |
Commit Details:
Full Hash: 6ae9dd0902ad60de8813fdf49bd2fb0c2cd6444a
Parent Commit: 0ff6eb8
Lines Changed: +97, -68
26 Modified Paths:
/release/scripts/startup/bl_ui/properties_data_gpencil.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_material_gpencil.py (+4, -2) (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 (+2, -15) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+2, -14) (Diff)
/source/blender/blenfont/BLF_api.h (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_thumbs.c (+2, -1) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/armature.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/subdiv_mesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/tracking_stabilize.c (+8, -5) (Diff)
/source/blender/blentranslation/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blentranslation/intern/blt_lang.c (+3, -0) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+2, -1) (Diff)
/source/blender/draw/engines/gpencil/gpencil_shader_fx.c (+1, -2) (Diff)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl (+5, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+1, -0) (Diff)
/source/blender/editors/space_action/action_select.c (+6, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+3, -0) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+4, -4) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -0) (Diff)
/source/blender/imbuf/IMB_thumbs.h (+12, -5) (Diff)
/source/blender/imbuf/intern/thumbs_font.c (+25, -9) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_material_gpencil.py (+4, -2) (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 (+2, -15) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+2, -14) (Diff)
/source/blender/blenfont/BLF_api.h (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_thumbs.c (+2, -1) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/armature.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/subdiv_mesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/tracking_stabilize.c (+8, -5) (Diff)
/source/blender/blentranslation/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blentranslation/intern/blt_lang.c (+3, -0) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+2, -1) (Diff)
/source/blender/draw/engines/gpencil/gpencil_shader_fx.c (+1, -2) (Diff)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl (+5, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+1, -0) (Diff)
/source/blender/editors/space_action/action_select.c (+6, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+3, -0) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+4, -4) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -0) (Diff)
/source/blender/imbuf/IMB_thumbs.h (+12, -5) (Diff)
/source/blender/imbuf/intern/thumbs_font.c (+25, -9) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -1) (Diff)