diff options
author | Campbell Barton <campbell@blender.org> | 2022-04-20 02:13:48 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-04-20 03:41:31 +0300 |
commit | 42717596d0c8638bd672966c0f1198db8344dcd5 (patch) | |
tree | abd14857c09ba75f7b3c55c7483ec1a3dfb02876 /intern | |
parent | f8f8edbe1a624e3c06b5068435368d122f3b64e5 (diff) |
Cleanup: clang-format
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/scene/object.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Wintab.cpp | 32 |
2 files changed, 21 insertions, 13 deletions
diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp index c57d26464ed..676cc78a11f 100644 --- a/intern/cycles/scene/object.cpp +++ b/intern/cycles/scene/object.cpp @@ -496,7 +496,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s kobject.dupli_generated[2] = ob->dupli_generated[2]; kobject.numkeys = (geom->geometry_type == Geometry::HAIR) ? static_cast<Hair *>(geom)->get_curve_keys().size() : - (geom->geometry_type == Geometry::POINTCLOUD) ? + (geom->geometry_type == Geometry::POINTCLOUD) ? static_cast<PointCloud *>(geom)->num_points() : 0; kobject.dupli_uv[0] = ob->dupli_uv[0]; diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp index be1a0a4b314..8e246272958 100644 --- a/intern/ghost/intern/GHOST_Wintab.cpp +++ b/intern/ghost/intern/GHOST_Wintab.cpp @@ -116,7 +116,11 @@ GHOST_Wintab *GHOST_Wintab::loadWintab(HWND hwnd) } int sanityQueueSize = queueSizeGet(hctx.get()); - WINTAB_PRINTF("HCTX %p %s queueSize: %d, queueSizeGet: %d\n", hctx.get(), __func__, queueSize, sanityQueueSize); + WINTAB_PRINTF("HCTX %p %s queueSize: %d, queueSizeGet: %d\n", + hctx.get(), + __func__, + queueSize, + sanityQueueSize); WINTAB_PRINTF("Loaded Wintab context %p\n", hctx.get()); @@ -274,7 +278,11 @@ void GHOST_Wintab::updateCursorInfo() else { m_maxAzimuth = m_maxAltitude = 0; } - WINTAB_PRINTF("HCTX %p %s maxAzimuth: %d, maxAltitude: %d\n", m_context.get(), __func__, m_maxAzimuth, m_maxAltitude); + WINTAB_PRINTF("HCTX %p %s maxAzimuth: %d, maxAltitude: %d\n", + m_context.get(), + __func__, + m_maxAzimuth, + m_maxAltitude); } void GHOST_Wintab::processInfoChange(LPARAM lParam) @@ -531,10 +539,10 @@ void GHOST_Wintab::printContextDebugInfo() /* Print system information. */ printf("left: %d, top: %d, width: %d, height: %d\n", - ::GetSystemMetrics(SM_XVIRTUALSCREEN), - ::GetSystemMetrics(SM_YVIRTUALSCREEN), - ::GetSystemMetrics(SM_CXVIRTUALSCREEN), - ::GetSystemMetrics(SM_CYVIRTUALSCREEN)); + ::GetSystemMetrics(SM_XVIRTUALSCREEN), + ::GetSystemMetrics(SM_YVIRTUALSCREEN), + ::GetSystemMetrics(SM_CXVIRTUALSCREEN), + ::GetSystemMetrics(SM_CYVIRTUALSCREEN)); auto printContextRanges = [](LOGCONTEXT &lc) { printf("lcInOrgX: %d, lcInOrgY: %d, lcInExtX: %d, lcInExtY: %d\n", @@ -576,7 +584,7 @@ void GHOST_Wintab::printContextDebugInfo() m_fpInfo(WTI_DEFSYSCTX, CTX_SYSEXTY, &lc.lcSysExtY); printf("WTI_DEFSYSCTX CTX_*\n"); printContextRanges(lc); - + for (unsigned int i = 0; i < m_numDevices; i++) { /* Print individual device system context. */ m_fpInfo(WTI_DSCTXS + i, 0, &lc); @@ -604,11 +612,11 @@ void GHOST_Wintab::printContextDebugInfo() m_fpInfo(WTI_DEVICES + i, DVC_X, &axis_x); m_fpInfo(WTI_DEVICES + i, DVC_Y, &axis_y); printf("WTI_DEVICES %u axis_x org: %d, axis_y org: %d axis_x ext: %d, axis_y ext: %d\n", - i, - axis_x.axMin, - axis_y.axMin, - axis_x.axMax - axis_x.axMin + 1, - axis_y.axMax - axis_y.axMin + 1); + i, + axis_x.axMin, + axis_y.axMin, + axis_x.axMax - axis_x.axMin + 1, + axis_y.axMax - axis_y.axMin + 1); } /* Other stuff while we have a logcontext. */ |