Blender Git Loki
Git Commits -> Revision 261d649
Revision 261d649 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) April 17, 2018, 14:05 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Note: There were some additional changes needed due to the EvaluationContext -> Depsgraph cleanups + MultiObject edit that happened in 2.8 since the last merge of 2.8 into this branch. # Conflicts: # release/datafiles/locale # release/scripts/addons # release/scripts/addons_contrib # source/blender/blenkernel/BKE_modifier.h # source/blender/editors/gpencil/gpencil_paint.c # source/blender/editors/include/ED_object.h # source/blender/editors/object/object_modifier.c # source/blender/editors/screen/screen_context.c # source/blender/editors/space_view3d/view3d_draw_legacy.c # source/blender/editors/transform/transform.c # source/blender/editors/transform/transform_conversions.c # source/blender/editors/transform/transform_generics.c # source/blender/editors/undo/ed_undo.c # source/tools |
Commit Details:
Full Hash: 261d64922b206840c9e4f8cd6eb059f3bd9aed5a
Parent Commits: 5626738, c991bb0