[Bf-blender-cvs] [9dcf078ddd4] soc-2021-curves: Merge branch 'master' into soc-2021-curves
dilithjay
noreply at git.blender.org
Sat Jul 24 19:12:03 CEST 2021
Commit: 9dcf078ddd433094d9716f817b8f32c187d09f85
Author: dilithjay
Date: Fri Jul 23 23:30:13 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB9dcf078ddd433094d9716f817b8f32c187d09f85
Merge branch 'master' into soc-2021-curves
===================================================================
===================================================================
diff --cc intern/ghost/intern/GHOST_NDOFManager.h
index 9c2824e57fb,7be129c327c..2eade8645fc
--- a/intern/ghost/intern/GHOST_NDOFManager.h
+++ b/intern/ghost/intern/GHOST_NDOFManager.h
@@@ -107,38 -107,29 +107,35 @@@ class GHOST_NDOFManager
{
}
- // whether multi-axis functionality is available (via the OS or driver)
- // does not imply that a device is plugged in or being used
+ /**
+ * Whether multi-axis functionality is available (via the OS or driver)
+ * does not imply that a device is plugged in or being used.
+ */
virtual bool available() = 0;
- // each platform's device detection should call this
- // use standard USB/HID identifiers
+ /**
+ * Rach platform's device detection should call this
+ * use standard USB/HID identifiers.
+ */
bool setDevice(unsigned short vendor_id, unsigned short product_id);
- // filter out small/accidental/uncalibrated motions by
- // setting up a "dead zone" around home position
- // set to 0 to disable
- // 0.1 is a safe and reasonable value
+ /**
+ * Filter out small/accidental/un-calibrated motions by
+ * setting up a "dead zone" around home position
+ * set to 0 to disable
+ * 0.1 is a safe and reasonable value.
+ */
void setDeadZone(float);
- /**
- * The latest raw axis data from the device.
- *
- * \note axis data should be in blender view coordinates
- * - +X is to the right.
- * - +Y is up.
- * - +Z is out of the screen.
- * - for rotations, look from origin to each +axis.
- * - rotations are + when CCW, - when CW.
- * Each platform is responsible for getting axis data into this form
- * these values should not be scaled (just shuffled or flipped).
- */
+ // the latest raw axis data from the device
+ // NOTE: axis data should be in blender view coordinates
+ // +X is to the right
+ // +Y is up
+ // +Z is out of the screen
+ // for rotations, look from origin to each +axis
+ // rotations are + when CCW, - when CW
+ // each platform is responsible for getting axis data into this form
+ // these values should not be scaled (just shuffled or flipped)
void updateTranslation(const int t[3], uint64_t time);
void updateRotation(const int r[3], uint64_t time);
@@@ -170,10 -157,10 +163,10 @@@
int m_translation[3];
int m_rotation[3];
- int m_buttons; // bit field
+ int m_buttons; /* Bit field. */
- uint64_t m_motionTime; /* In milliseconds. */
- uint64_t m_prevMotionTime; /* Time of most recent motion event sent. */
+ uint64_t m_motionTime; // in milliseconds
+ uint64_t m_prevMotionTime; // time of most recent Motion event sent
GHOST_TProgress m_motionState;
bool m_motionEventPending;
diff --cc intern/ghost/intern/GHOST_SystemSDL.cpp
index 0309a4f9c52,f2f1b26b8e5..e3358ac1508
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@@ -379,14 -376,14 +379,14 @@@ void GHOST_SystemSDL::processEvent(SDL_
bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis());
window->getCursorGrabAccum(x_accum, y_accum);
- /* Can't use #setCursorPosition because the mouse may have no focus! */
+ // can't use setCursorPosition because the mouse may have no focus!
if (x_new != x_root || y_new != y_root) {
- if (1) { //xme.time > m_last_warp) {
+ if (1 /* `xme.time > m_last_warp` */ ) {
/* when wrapping we don't need to add an event because the
- * setCursorPosition call will cause a new event after */
+ * #setCursorPosition call will cause a new event after */
SDL_WarpMouseInWindow(sdl_win, x_new - x_win, y_new - y_win); /* wrap */
window->setCursorGrabAccum(x_accum + (x_root - x_new), y_accum + (y_root - y_new));
- // m_last_warp= lastEventTime(xme.time);
+ // m_last_warp = lastEventTime(xme.time);
}
else {
// setCursorPosition(x_new, y_new); /* wrap but don't accumulate */
diff --cc release/scripts/modules/rna_manual_reference.py
index f9756811bde,57fcd6f9752..5c258428e12
--- a/release/scripts/modules/rna_manual_reference.py
+++ b/release/scripts/modules/rna_manual_reference.py
@@@ -15,2310 -15,2273 +15,4369 @@@ if language == 'DEFAULT'
language = os.getenv('LANG', '').split('.')[0]
LANG = {
--"ar_EG": "ar",
--"de_DE": "de",
--"es": "es",
--"fi_FI": "fi",
--"fr_FR": "fr",
--"id_ID": "id",
--"it_IT": "it",
--"ja_JP": "ja",
--"ko_KR": "ko",
--"pt_PT": "pt",
--"pt_BR": "pt",
--"ru_RU": "ru",
--"sk_SK": "sk",
--"sr_RS": "sr",
--"uk_UA": "uk",
--"vi_VN": "vi",
--"zh_CN": "zh-hans",
--"zh_TW": "zh-hant",
++ "ar_EG": "ar",
++ "de_DE": "de",
++ "es": "es",
++ "fi_FI": "fi",
++ "fr_FR": "fr",
++ "id_ID": "id",
++ "it_IT": "it",
++ "ja_JP": "ja",
++ "ko_KR": "ko",
++ "pt_PT": "pt",
++ "pt_BR": "pt",
++ "ru_RU": "ru",
++ "sk_SK": "sk",
++ "sr_RS": "sr",
++ "uk_UA": "uk",
++ "vi_VN": "vi",
++ "zh_CN": "zh-hans",
++ "zh_TW": "zh-hant",
}.get(language)
if LANG is not None:
-- url_manual_prefix = url_manual_prefix.replace("manual/en", "manual/" + LANG)
++ url_manual_prefix = url_manual_prefix.replace(
++ "manual/en", "manual/" + LANG)
url_manual_mapping = (
-- ("bpy.types.movietrackingsettings.refine_intrinsics_tangential_distortion*", "movie_clip/tracking/clip/toolbar/solve.html#bpy-types-movietrackingsettings-refine-intrinsics-tangential-distortion"),
-- ("bpy.types.movietrackingsettings.refine_intrinsics_radial_distortion*", "movie_clip/tracking/clip/toolbar/solve.html#bpy-types-movietrackingsettings-refine-intrinsics-radial-distortion"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_max_trappedair*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-max-trappedair"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_min_trappedair*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-min-trappedair"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_max_wavecrest*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-max-wavecrest"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_min_wavecrest*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-min-wavecrest"),
-- ("bpy.types.movietrackingsettings.refine_intrinsics_principal_point*", "movie_clip/tracking/clip/toolbar/solve.html#bpy-types-movietrackingsettings-refine-intrinsics-principal-point"),
-- ("bpy.types.cyclesrenderlayersettings.denoising_optix_input_passes*", "render/layers/denoising.html#bpy-types-cyclesrenderlayersettings-denoising-optix-input-passes"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_max_energy*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-max-energy"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_min_energy*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-min-energy"),
-- ("bpy.types.movietrackingsettings.refine_intrinsics_focal_length*", "movie_clip/tracking/clip/toolbar/solve.html#bpy-types-movietrackingsettings-refine-intrinsics-focal-length"),
-- ("bpy.types.rigidbodyconstraint.rigidbodyconstraint.use_breaking*", "physics/rigid_body/constraints/introduction.html#bpy-types-rigidbodyconstraint-rigidbodyconstraint-use-breaking"),
-- ("bpy.types.cyclesrendersettings.preview_denoising_input_passes*", "render/cycles/render_settings/sampling.html#bpy-types-cyclesrendersettings-preview-denoising-input-passes"),
-- ("bpy.types.fluiddomainsettings.sndparticle_sampling_trappedair*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-sampling-trappedair"),
-- ("bpy.types.fluiddomainsettings.sndparticle_sampling_wavecrest*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-sampling-wavecrest"),
-- ("bpy.types.rigidbodyconstraint.use_override_solver_iterations*", "physics/rigid_body/constraints/introduction.html#bpy-types-rigidbodyconstraint-use-override-solver-iterations"),
-- ("bpy.types.toolsettings.use_transform_correct_face_attributes*", "modeling/meshes/tools/tool_settings.html#bpy-types-toolsettings-use-transform-correct-face-attributes"),
-- ("bpy.types.toolsettings.use_transform_correct_keep_connected*", "modeling/meshes/tools/tool_settings.html#bpy-types-toolsettings-use-transform-correct-keep-connected"),
-- ("bpy.types.fluiddomainsettings.sndparticle_potential_radius*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-potential-radius"),
-- ("bpy.types.fluiddomainsettings.openvdb_cache_compress_type*", "physics/fluid/type/domain/cache.html#bpy-types-fluiddomainsettings-openvdb-cache-compress-type"),
-- ("bpy.types.fluiddomainsettings.sndparticle_bubble_buoyancy*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-bubble-buoyancy"),
-- ("bpy.types.fluiddomainsettings.sndparticle_combined_export*", "physics/fluid/type/domain/liquid/particles.html#bpy-types-fluiddomainsettings-sndparticle-combined-export"),
-- ("bpy.types.fluiddomainsettings.use_collision_border_bottom*", "physics/fluid/type/domain/settings.html#bpy-types-fluiddomainsettings-use-collision-border-bottom"),
-- ("bpy.types.fluiddomainsettings.vector_scale_with_magnitude*", "physics/fluid/type/domain/gas/viewport_display.html#bpy-types-fluiddomainsettings-vector-scale-with-magnitude"),
-- ("bpy.types.movietrackingstabilization.use_2d_stabilization*", "movie_clip/tracking/clip/sidebar/stabilization/panel.html#bpy-types-movietrackingstabilization-use-2d-stabilization"),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list