Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-07-21 14:23:17 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-07-21 14:23:17 +0400
commit256706ce7e88dfa4ec7f5ff215a03aea2aa5e71a (patch)
treefe00d6b4db3a3429f50b17f40becd56c2e831716 /source/blender/editors
parentf745564e4ee791e4faf804b09ce975b882f4f8d9 (diff)
Cleanup
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_handlers.c2
-rw-r--r--source/blender/editors/interface/resources.c2
-rw-r--r--source/blender/editors/transform/transform_conversions.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 76c5861ce0c..db083e494fb 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4319,7 +4319,7 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but, uiHandleButtonData *data, co
PaletteColor *color = but->rnapoin.data;
palette->active_color = BLI_findindex(&palette->colors, color);
- if( !event->ctrl) {
+ if (!event->ctrl) {
float color[3];
Scene *scene = CTX_data_scene(C);
Paint *paint = BKE_paint_get_active(scene);
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 65c01781d6d..1f66a4a4725 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2440,7 +2440,7 @@ void init_userdef_do_versions(void)
}
}
- if (U.versionfile < 272|| (U.versionfile == 272 && U.subversionfile < 2)) {
+ if (U.versionfile < 272 || (U.versionfile == 272 && U.subversionfile < 2)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
rgba_char_args_set_fl(btheme->tv3d.paint_curve_handle, 0.5f, 1.0f, 0.5f, 0.5f);
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index ddc50cbd0fe..3bd191bcc43 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -7039,7 +7039,8 @@ typedef struct TransDataPaintCurve {
#define PC_IS_ANY_SEL(pc) (((pc)->bez.f1 | (pc)->bez.f2 | (pc)->bez.f3) & SELECT)
-static void PaintCurveConvertHandle(PaintCurvePoint *pcp, int id, TransData2D *td2d, TransDataPaintCurve *tdpc, TransData *td) {
+static void PaintCurveConvertHandle(PaintCurvePoint *pcp, int id, TransData2D *td2d, TransDataPaintCurve *tdpc, TransData *td)
+{
BezTriple *bezt = &pcp->bez;
copy_v2_v2(td2d->loc, bezt->vec[id]);
td2d->loc[2] = 0.0f;