Changeset View
Changeset View
Standalone View
Standalone View
libs/ui/tool/kis_tool_paint.cc
Context not available. | |||||
399 | KisPaintDeviceSP device = fromCurrentNode ? | 399 | KisPaintDeviceSP device = fromCurrentNode ? | ||
---|---|---|---|---|---|
400 | currentNode()->colorPickSourceDevice() : image()->projection(); | 400 | currentNode()->colorPickSourceDevice() : image()->projection(); | ||
401 | 401 | | |||
402 | // Used for color picker blending. | ||||
403 | KoColor currentColor = canvas()->resourceManager()->foregroundColor(); | ||||
404 | if( pickingJob.action == PickBgNode || pickingJob.action == PickBgImage ){ | ||||
405 | currentColor = canvas()->resourceManager()->backgroundColor(); | ||||
406 | } | ||||
407 | | ||||
402 | image()->addJob(m_pickerStrokeId, | 408 | image()->addJob(m_pickerStrokeId, | ||
403 | new KisColorPickerStrokeStrategy::Data(device, imagePoint)); | 409 | new KisColorPickerStrokeStrategy::Data(device, imagePoint, currentColor)); | ||
404 | } | 410 | } | ||
405 | 411 | | |||
406 | void KisToolPaint::beginAlternateAction(KoPointerEvent *event, AlternateAction action) | 412 | void KisToolPaint::beginAlternateAction(KoPointerEvent *event, AlternateAction action) | ||
Context not available. |