Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Calligra
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Office
Calligra
Commits
bafbe74c
Commit
bafbe74c
authored
12 years ago
by
Dmitry Kazakov
Browse files
Options
Downloads
Patches
Plain Diff
Fixed Pipe Brush mask generation
The wrong check was added due to non-obvious naming. Fixed both. BUG:293828
parent
9506e67a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp
+6
-6
6 additions, 6 deletions
krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp
with
6 additions
and
6 deletions
krita/plugins/paintops/libbrush/kis_imagepipe_brush.cpp
+
6
−
6
View file @
bafbe74c
...
...
@@ -27,7 +27,7 @@ public:
QString
parasiteString
;
// Contains instructions on how to use the brush
mutable
KisPipeBrushParasite
parasite
;
qint32
numOfBrushes
;
mutable
quint32
currentBrush
;
mutable
quint32
currentBrush
Index
;
QByteArray
data
;
mutable
QList
<
KisGbrBrush
*>
brushes
;
...
...
@@ -41,7 +41,7 @@ KisImagePipeBrush::KisImagePipeBrush(const QString& filename)
{
m_d
->
brushType
=
INVALID
;
m_d
->
numOfBrushes
=
0
;
m_d
->
currentBrush
=
0
;
m_d
->
currentBrush
Index
=
0
;
}
KisImagePipeBrush
::
KisImagePipeBrush
(
const
QString
&
name
,
int
w
,
int
h
,
...
...
@@ -229,8 +229,8 @@ void KisImagePipeBrush::generateMaskAndApplyMaskOrCreateDab(KisFixedPaintDeviceS
{
if
(
m_d
->
brushes
.
isEmpty
())
return
;
selectNextBrush
(
info
);
if
(
m_d
->
currentBrush
)
m_d
->
brushes
.
at
(
m_d
->
currentBrush
)
->
generateMaskAndApplyMaskOrCreateDab
(
dst
,
coloringInformation
,
scaleX
,
scaleY
,
angle
,
info
,
subPixelX
,
subPixelY
,
softnessFactor
);
m_d
->
brushes
.
at
(
m_d
->
currentBrush
Index
)
->
generateMaskAndApplyMaskOrCreateDab
(
dst
,
coloringInformation
,
scaleX
,
scaleY
,
angle
,
info
,
subPixelX
,
subPixelY
,
softnessFactor
);
}
KisFixedPaintDeviceSP
KisImagePipeBrush
::
paintDevice
(
const
KoColorSpace
*
colorSpace
,
double
scale
,
double
angle
,
const
KisPaintInformation
&
info
,
double
subPixelX
,
double
subPixelY
)
const
...
...
@@ -239,7 +239,7 @@ KisFixedPaintDeviceSP KisImagePipeBrush::paintDevice(const KoColorSpace * colorS
Q_UNUSED
(
angle
);
if
(
m_d
->
brushes
.
isEmpty
())
return
KisFixedPaintDeviceSP
(
0
);
selectNextBrush
(
info
);
return
m_d
->
brushes
.
at
(
m_d
->
currentBrush
)
->
paintDevice
(
colorSpace
,
scale
,
angle
,
info
,
subPixelX
,
subPixelY
);
return
m_d
->
brushes
.
at
(
m_d
->
currentBrush
Index
)
->
paintDevice
(
colorSpace
,
scale
,
angle
,
info
,
subPixelX
,
subPixelY
);
}
void
KisImagePipeBrush
::
setParasiteString
(
const
QString
&
parasite
)
...
...
@@ -330,7 +330,7 @@ const KisBoundary* KisImagePipeBrush::boundary() const
void
KisImagePipeBrush
::
selectNextBrush
(
const
KisPaintInformation
&
info
)
const
{
m_d
->
currentBrush
=
brushIndex
(
info
);
m_d
->
currentBrush
Index
=
brushIndex
(
info
);
}
bool
KisImagePipeBrush
::
canPaintFor
(
const
KisPaintInformation
&
info
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment