mirror of https://github.com/aseprite/aseprite.git
Compare commits
3 Commits
107e846911
...
95d0dee4e0
| Author | SHA1 | Date |
|---|---|---|
|
|
95d0dee4e0 | |
|
|
7ee486ebde | |
|
|
d3ef5c61da |
|
|
@ -31,6 +31,9 @@
|
||||||
# readability-named-parameter: We prefer misc-unused-parameters to
|
# readability-named-parameter: We prefer misc-unused-parameters to
|
||||||
# remove a parameter name that is not used.
|
# remove a parameter name that is not used.
|
||||||
#
|
#
|
||||||
|
# readability-simplify-boolean-expr: Avoid showing comments about
|
||||||
|
# boolean expressions inside ASSERTs().
|
||||||
|
#
|
||||||
# misc-use-anonymous-namespace: We use anonymous namespaces or static
|
# misc-use-anonymous-namespace: We use anonymous namespaces or static
|
||||||
# functions indifferently.
|
# functions indifferently.
|
||||||
#
|
#
|
||||||
|
|
@ -64,6 +67,8 @@ CheckOptions:
|
||||||
value: true
|
value: true
|
||||||
- key: readability-implicit-bool-conversion.AllowPointerConditions
|
- key: readability-implicit-bool-conversion.AllowPointerConditions
|
||||||
value: true
|
value: true
|
||||||
|
- key: readability-simplify-boolean-expr.IgnoreMacros
|
||||||
|
value: true
|
||||||
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
|
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
|
||||||
value: true
|
value: true
|
||||||
...
|
...
|
||||||
|
|
|
||||||
2
laf
2
laf
|
|
@ -1 +1 @@
|
||||||
Subproject commit 39706c11063fb53cf4c8e865102c6f71e2606906
|
Subproject commit 12ea4f7aa466c5a7a570c2e8d61fe2d10b57b9fb
|
||||||
|
|
@ -104,7 +104,7 @@ void ColorPicker::pickColor(const Site& site,
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
// Pick from the composed image
|
// Pick from the composed image
|
||||||
case FromComposition: {
|
case FromComposition: {
|
||||||
doc::RenderPlan plan(pref.experimental.composeGroups());
|
doc::RenderPlan plan;
|
||||||
plan.addLayer(sprite->root(), site.frame());
|
plan.addLayer(sprite->root(), site.frame());
|
||||||
|
|
||||||
doc::CelList cels;
|
doc::CelList cels;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue