Blender Git Loki
Git Commits -> Revision 7021bd5
Revision 7021bd5 by Antonio Vazquez (master) March 25, 2019, 16:06 (GMT) |
GPencil: Only brushes with pinned materials have materials Using GP_BRUSH_MATERIAL_PINNED to switch between active material and brush material, instead of updating all brushes on active material changes. This will allow brushes to have no material and therefore to not inflate the user count. This fix T62465. Patch contributed by @matc Reviewers: @brecht @antoniov @billreynish @mendio |
Commit Details:
Full Hash: 7021bd527380b4d87cf48057f0039509326b03dd
Parent Commit: 84240eb
Lines Changed: +293, -263
23 Modified Paths:
/release/scripts/startup/bl_ui/properties_grease_pencil_common.py (+11, -0) (Diff)
/release/scripts/startup/bl_ui/space_topbar.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+9, -1) (Diff)
/source/blender/blenkernel/BKE_brush.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+15, -0) (Diff)
/source/blender/blenkernel/intern/brush.c (+0, -18) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+135, -12) (Diff)
/source/blender/blenkernel/intern/material.c (+0, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+13, -2) (Diff)
/source/blender/draw/engines/gpencil/gpencil_draw_utils.c (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_add_monkey.c (+4, -9) (Diff)
/source/blender/editors/gpencil/gpencil_add_stroke.c (+4, -9) (Diff)
/source/blender/editors/gpencil/gpencil_brush.c (+3, -7) (Diff)
/source/blender/editors/gpencil/gpencil_data.c (+5, -25) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+9, -48) (Diff)
/source/blender/editors/gpencil/gpencil_fill.c (+9, -13) (Diff)
/source/blender/editors/gpencil/gpencil_old.c (+1, -3) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+15, -23) (Diff)
/source/blender/editors/gpencil/gpencil_primitive.c (+3, -22) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+24, -35) (Diff)
/source/blender/editors/render/render_shading.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+23, -21) (Diff)
/source/blender/makesrna/intern/rna_object.c (+7, -6) (Diff)
/release/scripts/startup/bl_ui/space_topbar.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+9, -1) (Diff)
/source/blender/blenkernel/BKE_brush.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_gpencil.h (+15, -0) (Diff)
/source/blender/blenkernel/intern/brush.c (+0, -18) (Diff)
/source/blender/blenkernel/intern/gpencil.c (+135, -12) (Diff)
/source/blender/blenkernel/intern/material.c (+0, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+13, -2) (Diff)
/source/blender/draw/engines/gpencil/gpencil_draw_utils.c (+1, -1) (Diff)
/source/blender/editors/gpencil/gpencil_add_monkey.c (+4, -9) (Diff)
/source/blender/editors/gpencil/gpencil_add_stroke.c (+4, -9) (Diff)
/source/blender/editors/gpencil/gpencil_brush.c (+3, -7) (Diff)
/source/blender/editors/gpencil/gpencil_data.c (+5, -25) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+9, -48) (Diff)
/source/blender/editors/gpencil/gpencil_fill.c (+9, -13) (Diff)
/source/blender/editors/gpencil/gpencil_old.c (+1, -3) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+15, -23) (Diff)
/source/blender/editors/gpencil/gpencil_primitive.c (+3, -22) (Diff)
/source/blender/editors/gpencil/gpencil_utils.c (+24, -35) (Diff)
/source/blender/editors/render/render_shading.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+23, -21) (Diff)
/source/blender/makesrna/intern/rna_object.c (+7, -6) (Diff)