mirror of
https://github.com/blender/blender
synced 2026-09-29 04:37:17 +03:00
Cleanup: consistent for C-style comment blocks
This commit is contained in:
Campbell Barton
parent
86dcdb418d
commit
cccc2c77c5
105 changed files with 181 additions and 179 deletions
|
|
@ -1341,7 +1341,7 @@ void OneapiDevice::get_adjusted_global_and_local_sizes(SyclQueue *queue,
|
|||
static const int lowest_supported_driver_version_win = 1016554;
|
||||
# ifdef _WIN32
|
||||
/* For Windows driver 101.6557, compute-runtime version is 31896.
|
||||
* This information is returned by `ocloc query OCL_DRIVER_VERSION`.*/
|
||||
* This information is returned by `ocloc query OCL_DRIVER_VERSION`. */
|
||||
static const int lowest_supported_driver_version_neo = 31896;
|
||||
# else
|
||||
static const int lowest_supported_driver_version_neo = 31740;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ ccl_device float3 phase_rayleigh_sample(const float3 D, const float2 rand, ccl_p
|
|||
{
|
||||
const float a = 2 - 4 * rand.x;
|
||||
/* Metal doesn't have cbrtf, but since we compute u - 1/u anyways, we can just as well
|
||||
* use the inverse cube root for which there is a simple Quake-style fast implementation.*/
|
||||
* use the inverse cube root for which there is a simple Quake-style fast implementation. */
|
||||
const float inv_u = -fast_inv_cbrtf(sqrtf(1 + sqr(a)) + a);
|
||||
const float cos_theta = 1 / inv_u - inv_u;
|
||||
*pdf = phase_rayleigh(cos_theta);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ ccl_device_inline void triangle_point_normal(KernelGlobals kg,
|
|||
else {
|
||||
*Ng = normalize(cross(v1 - v0, v2 - v0));
|
||||
}
|
||||
/* shader`*/
|
||||
/* shader */
|
||||
*shader = kernel_data_fetch(tri_shader, prim);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ template<typename T>
|
|||
void SubdAttributeInterpolation::setup_attribute_face(const Attribute &subd_attr,
|
||||
Attribute &mesh_attr)
|
||||
{
|
||||
/* Copy value from face to triangle .*/
|
||||
/* Copy value from face to triangle. */
|
||||
SubdAttribute attr;
|
||||
const typename T::Type *subd_data = reinterpret_cast<const typename T::Type *>(subd_attr.data());
|
||||
typename T::Type *mesh_data = reinterpret_cast<typename T::Type *>(mesh_attr.data());
|
||||
|
|
|
|||
|
|
@ -4055,7 +4055,7 @@ static void pointer_handle_frame(void *data, wl_pointer * /*wl_pointer*/)
|
|||
/* We never want mouse wheel events to be treated as smooth scrolling as this
|
||||
* causes mouse wheel scroll to orbit the view, see #120587.
|
||||
* Although it could be supported if the event system would forward
|
||||
* the source of the scroll action (a wheel or touch device). */
|
||||
* the source of the scroll action (a wheel or touch device). */
|
||||
ps.smooth_xy[0] = 0;
|
||||
ps.smooth_xy[1] = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ AssetLibrary *AssetLibraryService::get_asset_library(
|
|||
return this->get_asset_library_on_disk_builtin(type, root_path);
|
||||
}
|
||||
case ASSET_LIBRARY_LOCAL: {
|
||||
/* For the "Current File" library we get the asset library root path based on main. */
|
||||
/* For the "Current File" library we get the asset library root path based on main. */
|
||||
std::string root_path = bmain ? AS_asset_library_find_suitable_root_path_from_main(bmain) :
|
||||
"";
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
* The Info.plist file should be properly configured with supported content type.
|
||||
*
|
||||
* # Codesigning
|
||||
* The plugin should be codesigned with entitlements at least for sandbox and read-only/
|
||||
* The plugin should be codesigned with entitlements at least for sandbox and read-only/
|
||||
* read-write (for access to the given file). It's needed to even run the plugin locally.
|
||||
* com.apple.security.get-task-allow entitlement is required for debugging.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ template<typename T> class SimpleMixer {
|
|||
* mixers in order to be simpler to use. This mixing method has a few benefits:
|
||||
* - An "average" for selections is relatively meaningless.
|
||||
* - Predictable selection propagation is very super important.
|
||||
* - It's generally easier to remove an element from a selection that is slightly too large than
|
||||
* - It's generally easier to remove an element from a selection that is slightly too large than
|
||||
* the opposite.
|
||||
*/
|
||||
class BooleanPropagationMixer {
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ BMEditMesh *BKE_editmesh_from_object(Object *ob);
|
|||
bool BKE_editmesh_eval_orig_map_available(const Mesh &mesh_eval, const Mesh *mesh_orig);
|
||||
|
||||
/**
|
||||
* \note Does not free the #BMEditMesh itself.
|
||||
* \note Does not free the #BMEditMesh itself.
|
||||
*/
|
||||
void BKE_editmesh_free_data(BMEditMesh *em);
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ void BKE_mesh_legacy_convert_flags_to_hide_layers(Mesh *mesh);
|
|||
void BKE_mesh_legacy_convert_flags_to_selection_layers(Mesh *mesh);
|
||||
|
||||
/**
|
||||
* Move material indices from the #MPoly to a generic attributes.
|
||||
* Move material indices from the #MPoly to a generic attributes.
|
||||
* Only add the attribute when the indices are not all zero.
|
||||
*/
|
||||
void BKE_mesh_legacy_convert_mpoly_to_material_indices(Mesh *mesh);
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ typedef struct ShaderFxTypeInfo {
|
|||
#define SHADERFX_TYPE_PANEL_PREFIX "FX_PT_"
|
||||
|
||||
/**
|
||||
* Initialize global data (type info and some common global storage).
|
||||
* Initialize global data (type info and some common global storage).
|
||||
*/
|
||||
void BKE_shaderfx_init(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ void BKE_shrinkwrap_remesh_target_project(Mesh *src_me, Mesh *target_me, Object
|
|||
* - #MOD_SHRINKWRAP_CULL_TARGET_BACKFACE (back faces hits are ignored)
|
||||
*
|
||||
* \param transf: Take into consideration the space_transform, that is:
|
||||
* if `transf` was configured with `SPACE_TRANSFORM_SETUP( &transf, ob1, ob2)`
|
||||
* if `transf` was configured with `SPACE_TRANSFORM_SETUP(&transf, ob1, ob2)`
|
||||
* then the input (vert, dir, #BVHTreeRayHit) must be defined in ob1 coordinates space
|
||||
* and the #BVHTree must be built in ob2 coordinate space.
|
||||
* Thus it provides an easy way to cast the same ray across several trees
|
||||
|
|
|
|||
|
|
@ -3215,8 +3215,8 @@ std::optional<blender::Bounds<blender::float3>> BKE_pose_minmax(const Object *ob
|
|||
if (!pchan->bone) {
|
||||
continue;
|
||||
}
|
||||
/* Despite `bone_is_selected` also checking for visibility we need to check visbility
|
||||
* manually due to `use_select` potentially ignoring selection state.*/
|
||||
/* Despite `bone_is_selected` also checking for visibility we need to check visibility
|
||||
* manually due to `use_select` potentially ignoring selection state. */
|
||||
if (!blender::animrig::bone_is_visible_pchan(arm, pchan)) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3581,7 +3581,7 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
|
|||
damptrack_do_transform(cob->matrix, vec, TRACK_Y);
|
||||
break;
|
||||
case PLANE_X:
|
||||
/* New Y aligns object target connection. */
|
||||
/* New Y aligns object target connection. */
|
||||
copy_v3_v3(cob->matrix[1], vec);
|
||||
|
||||
/* Build new Z vector. */
|
||||
|
|
@ -3597,7 +3597,7 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
|
|||
normalize_v3_v3(cob->matrix[0], xx);
|
||||
break;
|
||||
case PLANE_Z:
|
||||
/* New Y aligns object target connection. */
|
||||
/* New Y aligns object target connection. */
|
||||
copy_v3_v3(cob->matrix[1], vec);
|
||||
|
||||
/* Build new X vector. */
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ CurveProfilePoint *BKE_curveprofile_insert(CurveProfile *profile, float x, float
|
|||
{
|
||||
const float new_loc[2] = {x, y};
|
||||
|
||||
/* Don't add more control points than the maximum size of the higher resolution table. */
|
||||
/* Don't add more control points than the maximum size of the higher resolution table. */
|
||||
if (profile->path_len == PROF_TABLE_MAX - 1) {
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ TEST(file_handler, remove)
|
|||
EXPECT_EQ(file_handlers().size(), MAX_FILE_HANDLERS_TEST_SIZE - 2);
|
||||
EXPECT_EQ(file_handler_find("Test_FH_blender8"), nullptr);
|
||||
|
||||
/** `FileHandlerType` pointer in `test_file_handlers[7]` is not longer valid. */
|
||||
/** `FileHandlerType` pointer in `test_file_handlers[7]` is not longer valid. */
|
||||
EXPECT_EQ(file_handler_find("Test_FH_blender1"), test_file_handlers[0]);
|
||||
EXPECT_EQ(file_handler_find("Test_FH_blender3"), test_file_handlers[2]);
|
||||
EXPECT_EQ(file_handler_find("Test_FH_blender4"), test_file_handlers[3]);
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ struct AnimDataFCurveConvertor {
|
|||
* - Convert FCurves and move them from the source to the destination IDs animation data.
|
||||
* The constructor used defines which of these two 'modes' will be the used by a given convertor.
|
||||
*
|
||||
* RNA paths to convert can be specified in two ways:
|
||||
* RNA paths to convert can be specified in two ways:
|
||||
* - Complete paths, with a list of source to destination pairs of paths (relative to the relevant
|
||||
* root paths).
|
||||
* - Only by the source and destination root paths (in which case all FCurves starting by these
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class IDPropertySerializer {
|
|||
|
||||
/**
|
||||
* \brief return the type name for (de)serializing.
|
||||
* Type name is stored in the `type` or `subtype` attribute of the serialized id_property.
|
||||
* Type name is stored in the `type` or `subtype` attribute of the serialized id_property.
|
||||
*/
|
||||
virtual std::string type_name() const = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -690,7 +690,7 @@ static void add_mface_layers(Mesh &mesh, CustomData *fdata_legacy, CustomData *l
|
|||
static void mesh_ensure_tessellation_customdata(Mesh *mesh)
|
||||
{
|
||||
if (UNLIKELY((mesh->totface_legacy != 0) && (mesh->faces_num == 0))) {
|
||||
/* Pass, otherwise this function clears 'mface' before
|
||||
/* Pass, otherwise this function clears 'mface' before
|
||||
* versioning 'mface -> mpoly' code kicks in #30583.
|
||||
*
|
||||
* Callers could also check but safer to do here - campbell */
|
||||
|
|
|
|||
|
|
@ -3730,7 +3730,7 @@ static void dynamics_step_sph_ddr_task_cb_ex(DynamicStepSolverTaskData *data,
|
|||
}
|
||||
|
||||
/* SPH particles are not physical particles, just interpolation
|
||||
* particles, thus rotation has not a direct sense for them */
|
||||
* particles, thus rotation has not a direct sense for them. */
|
||||
basic_rotate(part, pa, pa->state.time, data->timestep);
|
||||
|
||||
if (part->time_flag & PART_TIME_AUTOSF) {
|
||||
|
|
@ -3797,7 +3797,7 @@ static void dynamics_step_sph_classical_integrate_task_cb_ex(void *__restrict us
|
|||
}
|
||||
|
||||
/* SPH particles are not physical particles, just interpolation
|
||||
* particles, thus rotation has not a direct sense for them */
|
||||
* particles, thus rotation has not a direct sense for them. */
|
||||
basic_rotate(part, pa, pa->state.time, data->timestep);
|
||||
|
||||
if (part->time_flag & PART_TIME_AUTOSF) {
|
||||
|
|
|
|||
|
|
@ -628,7 +628,7 @@ static void add_2nd_order_roller(Object *ob, float /*stiffness*/, int *counter,
|
|||
if (!sb->bspring) {
|
||||
return;
|
||||
} /* we are 2nd order here so 1rst should have been build :) */
|
||||
/* first run counting second run adding */
|
||||
/* First run counting second run adding. */
|
||||
*counter = 0;
|
||||
if (addsprings) {
|
||||
bs3 = ob->soft->bspring + ob->soft->totspring;
|
||||
|
|
@ -1988,7 +1988,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene,
|
|||
|
||||
bp = &sb->bpoint[ifirst];
|
||||
for (bb = number_of_points_here; bb > 0; bb--, bp++) {
|
||||
/* clear forces accumulator */
|
||||
/* Clear forces accumulator. */
|
||||
bp->force[0] = bp->force[1] = bp->force[2] = 0.0;
|
||||
/* naive ball self collision */
|
||||
/* needs to be done if goal snaps or not */
|
||||
|
|
|
|||
|
|
@ -1209,7 +1209,7 @@ static int adjacent_edge_point_index_from_coord(const SubdivCCG &subdiv_ccg,
|
|||
return adjacent_edge_point_index;
|
||||
}
|
||||
|
||||
/* Adjacent edge has two points in the middle which corresponds to grid corners, but which are
|
||||
/* Adjacent edge has two points in the middle which corresponds to grid corners, but which are
|
||||
* the same point in the final geometry.
|
||||
* So need to use extra step when calculating next/previous points, so we don't go from a corner
|
||||
* of one grid to a corner of adjacent grid. */
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ void BKE_uvproject_from_camera(float target[2], float source[3], ProjCameraInfo
|
|||
if (uci->do_pano) {
|
||||
float angle = atan2f(pv4[0], -pv4[2]) / (float(M_PI) * 2.0f); /* angle around the camera */
|
||||
if (uci->do_persp == false) {
|
||||
target[0] = angle; /* no correct method here, just map to 0-1 */
|
||||
target[0] = angle; /* No correct method here, just map to 0-1. */
|
||||
target[1] = pv4[1] / uci->camsize;
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* the `OS_WINDOWS` is defined to 1, and all the other symbols prefixed with `OS_` are defined to 0
|
||||
* (except of the aggregates described above).
|
||||
*
|
||||
* There are aggregates which allows to access "family" of the operating system:
|
||||
* There are aggregates which allows to access "family" of the operating system:
|
||||
*
|
||||
* - OS_BSD is defined for 1 for all BSD family of OS (FreeBSD, NextBSD, DragonFly...).
|
||||
* - OS_POSIX is defined to 1 if the OS implements POSIX API.
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ enum {
|
|||
* \param info: Identifier string for the GHash.
|
||||
* \param nentries_reserve: Optionally reserve the number of members that the hash will hold.
|
||||
* Use this to avoid resizing buckets if the size is known or can be closely approximated.
|
||||
* \return An empty GHash.
|
||||
* \return An empty GHash.
|
||||
*/
|
||||
GHash *BLI_ghash_new_ex(GHashHashFP hashfp,
|
||||
GHashCmpFP cmpfp,
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ bool equals_m4m4(const float mat1[4][4], const float mat2[4][4]);
|
|||
* (where conversion can be represented by a matrix multiplication).
|
||||
*
|
||||
* A #SpaceTransform is initialized using:
|
||||
* - #BLI_SPACE_TRANSFORM_SETUP(&data, ob1, ob2)
|
||||
* - #BLI_SPACE_TRANSFORM_SETUP(&data, ob1, ob2)
|
||||
*
|
||||
* After that the following calls can be used:
|
||||
* - Converts a coordinate in ob1 space to the corresponding ob2 space:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ template<typename T, typename RotT>
|
|||
[[nodiscard]] Euler3Base<T> rotate(const Euler3Base<T> &a, const RotT &b);
|
||||
|
||||
/**
|
||||
* Return rotation from orientation \a a to orientation \a b into another quaternion.
|
||||
* Return rotation from orientation \a a to orientation \a b into another quaternion.
|
||||
*/
|
||||
template<typename T>
|
||||
[[nodiscard]] QuaternionBase<T> rotation_between(const QuaternionBase<T> &a,
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ static size_t find_byte_not_equal_to(const uint8_t *data,
|
|||
|
||||
if (LIKELY(size - offset > min_size_for_fast_path)) {
|
||||
|
||||
/* Pass 1: Scan forward with a fixed size to check if an early exit
|
||||
/* Pass 1: Scan forward with a fixed size to check if an early exit
|
||||
* is needed (this may exit on the first few bytes). */
|
||||
const uint8_t *p = data + offset;
|
||||
const uint8_t *p_end = p + sizeof(size_t[2]);
|
||||
|
|
|
|||
|
|
@ -1448,7 +1448,7 @@ template<typename T> void dc_triangulate(CDTArrangement<T> *cdt, Array<SiteInfo<
|
|||
|
||||
/**
|
||||
* Do a Delaunay Triangulation of the points in cdt.verts.
|
||||
* This is only a first step in the Constrained Delaunay triangulation,
|
||||
* This is only a first step in the Constrained Delaunay triangulation,
|
||||
* because it doesn't yet deal with the segment constraints.
|
||||
* The algorithm used is the Divide & Conquer algorithm from the
|
||||
* Guibas-Stolfi "Primitives for the Manipulation of General Subdivision
|
||||
|
|
|
|||
|
|
@ -542,12 +542,12 @@ static int fast_expansion_sum_zeroelim(
|
|||
return hindex;
|
||||
}
|
||||
|
||||
/* scale_expansion_zeroelim() Multiply an expansion by a scalar,
|
||||
* eliminating zero components from the
|
||||
* output expansion.
|
||||
/* scale_expansion_zeroelim() Multiply an expansion by a scalar,
|
||||
* eliminating zero components from the
|
||||
* output expansion.
|
||||
*
|
||||
* Sets h = be. See either version of my paper for details.
|
||||
* e and h cannot be the same.
|
||||
* Sets h = be. See either version of my paper for details.
|
||||
* e and h cannot be the same.
|
||||
*/
|
||||
static int scale_expansion_zeroelim(int elen, const double *e, double b, double *h)
|
||||
{
|
||||
|
|
@ -588,7 +588,7 @@ static int scale_expansion_zeroelim(int elen, const double *e, double b, double
|
|||
return hindex;
|
||||
}
|
||||
|
||||
/* estimate() Produce a one-word estimate of an expansion's value. */
|
||||
/* estimate() Produce a one-word estimate of an expansion's value. */
|
||||
static double estimate(int elen, const double *e)
|
||||
{
|
||||
double Q;
|
||||
|
|
|
|||
|
|
@ -2431,7 +2431,7 @@ static void extract_zero_volume_cell_tris(Vector<Face *> &r_tris,
|
|||
* The cells in \a cinfo must have cells-to-be-retained with in_output_volume set.
|
||||
* We keep only triangles between those in the output volume and those not in.
|
||||
* We flip the normals of any triangle that has an in_output_volume cell above
|
||||
* and a not-in_output_volume cell below.
|
||||
* and a not-in_output_volume cell below.
|
||||
* For all stacks of exact duplicate co-planar triangles, we want to
|
||||
* include either one version of the triangle or none, depending on
|
||||
* whether the in_output_volume in_output_volumes on either side of the stack are
|
||||
|
|
|
|||
|
|
@ -2423,7 +2423,7 @@ static void calc_overlap_itts_range_func(void *__restrict userdata,
|
|||
|
||||
/**
|
||||
* Fill in itt_map with the vector of ITT_values that result from intersecting the triangles in
|
||||
* ov. Use a canonical order for triangles: (a,b) where a < b.
|
||||
* ov. Use a canonical order for triangles: (a,b) where `a < b`.
|
||||
*/
|
||||
static void calc_overlap_itts(Map<std::pair<int, int>, ITT_value> &itt_map,
|
||||
const IMesh &tm,
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ struct BMEdgeLoopStore {
|
|||
ListBase verts;
|
||||
int flag;
|
||||
int len;
|
||||
/* optional values to calc */
|
||||
/* Optional values to calculate. */
|
||||
float co[3], no[3];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -964,7 +964,7 @@ static void bm_mesh_loops_calc_normals_for_vert_with_clnors(
|
|||
r_lnos,
|
||||
r_lnors_spacearr);
|
||||
|
||||
/* Check if an early exit is possible without an exhaustive inspection of every loop
|
||||
/* Check if an early exit is possible without an exhaustive inspection of every loop
|
||||
* where 1 loop's fan extends out to all remaining loops.
|
||||
* This is a common case for smooth vertices. */
|
||||
BLI_assert(loops_of_vert_handled <= loops_of_vert_count);
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ BMFace *BM_face_split_n(BMesh *bm,
|
|||
*
|
||||
* \param bm: The bmesh
|
||||
* \param e_kill: The edge to collapse
|
||||
* \param v_kill: The vertex to collapse into the edge
|
||||
* \param v_kill: The vertex to collapse into the edge
|
||||
* \param fac: The factor along the edge
|
||||
* \param join_faces: When true the faces around the vertex will be joined
|
||||
* otherwise collapse the vertex by merging the 2 edges this vert touches into one.
|
||||
|
|
@ -183,7 +183,7 @@ BMVert *BM_edge_collapse(
|
|||
* \param v: One of the vertices in \a e and defines the "from" end of the splitting operation,
|
||||
* the new vertex will be \a fac of the way from \a v to the other end.
|
||||
* \param r_e: The newly created edge.
|
||||
* \return The new vertex.
|
||||
* \return The new vertex.
|
||||
*/
|
||||
BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac);
|
||||
|
||||
|
|
|
|||
|
|
@ -760,7 +760,7 @@ static BMOpDefine bmo_bridge_loops_def = {
|
|||
{"use_cyclic", BMO_OP_SLOT_BOOL},
|
||||
/* Merge rather than creating faces. */
|
||||
{"use_merge", BMO_OP_SLOT_BOOL},
|
||||
/* merge factor */
|
||||
/* Merge factor. */
|
||||
{"merge_factor", BMO_OP_SLOT_FLT},
|
||||
/* Twist offset for closed loops. */
|
||||
{"twist_offset", BMO_OP_SLOT_INT},
|
||||
|
|
|
|||
|
|
@ -31,17 +31,17 @@ static int bmo_name_to_slotcode_check(const BMOpSlot slot_args[BMO_OP_MAX_SLOTS]
|
|||
const char *identifier);
|
||||
|
||||
const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES] = {
|
||||
0, /* 0: BMO_OP_SLOT_SENTINEL */
|
||||
sizeof(int), /* 1: BMO_OP_SLOT_BOOL */
|
||||
sizeof(int), /* 2: BMO_OP_SLOT_INT */
|
||||
sizeof(float), /* 3: BMO_OP_SLOT_FLT */
|
||||
sizeof(void *), /* 4: BMO_OP_SLOT_PNT */
|
||||
sizeof(void *), /* 5: BMO_OP_SLOT_PNT */
|
||||
0, /* 6: unused */
|
||||
0, /* 7: unused */
|
||||
sizeof(float[3]), /* 8: BMO_OP_SLOT_VEC */
|
||||
sizeof(void *), /* 9: BMO_OP_SLOT_ELEMENT_BUF */
|
||||
sizeof(void *), /* 10: BMO_OP_SLOT_MAPPING */
|
||||
0, /* 0: #BMO_OP_SLOT_SENTINEL */
|
||||
sizeof(int), /* 1: #BMO_OP_SLOT_BOOL */
|
||||
sizeof(int), /* 2: #BMO_OP_SLOT_INT */
|
||||
sizeof(float), /* 3: #BMO_OP_SLOT_FLT */
|
||||
sizeof(void *), /* 4: #BMO_OP_SLOT_PNT */
|
||||
sizeof(void *), /* 5: #BMO_OP_SLOT_PNT */
|
||||
0, /* 6: unused */
|
||||
0, /* 7: unused */
|
||||
sizeof(float[3]), /* 8: #BMO_OP_SLOT_VEC */
|
||||
sizeof(void *), /* 9: #BMO_OP_SLOT_ELEMENT_BUF */
|
||||
sizeof(void *), /* 10: #BMO_OP_SLOT_MAPPING */
|
||||
};
|
||||
|
||||
/* Dummy slot so there is something to return when slot name lookup fails */
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ static void bm_subdivide_multicut(
|
|||
|
||||
/* NOTE: the patterns are rotated as necessary to
|
||||
* match the input geometry. they're based on the
|
||||
* pre-split state of the face */
|
||||
* pre-split state of the face */
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* \brief BM_mesh_decimate
|
||||
* \param bm: The mesh
|
||||
* \param factor: face count multiplier [0 - 1]
|
||||
* \param vweights: Optional array of vertex aligned weights [0 - 1],
|
||||
* \param vweights: Optional array of vertex aligned weights [0 - 1],
|
||||
* a vertex group is the usual source for this.
|
||||
* \param symmetry_axis: Axis of symmetry, -1 to disable mirror decimate.
|
||||
* \param symmetry_eps: Threshold when matching mirror verts.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ void main()
|
|||
|
||||
barrier();
|
||||
if (gl_LocalInvocationIndex == 0) {
|
||||
/* Note that we store using a transposed texel, but that is only to undo the transposition
|
||||
/* Note that we store using a transposed texel, but that is only to undo the transposition
|
||||
* mentioned above. Also note that we start from the second row because the first row is
|
||||
* set to zero as mentioned above. */
|
||||
float4 sum = complete_prologue[0];
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ void DEG_foreach_dependent_ID(const Depsgraph *depsgraph,
|
|||
|
||||
/**
|
||||
* Starts traversal from given component of the given ID, invokes callback for every other
|
||||
* component which is directly on indirectly dependent on the source one.
|
||||
* component which is directly on indirectly dependent on the source one.
|
||||
*/
|
||||
enum {
|
||||
/* Ignore transform solvers which depends on multiple inputs and affects final transform.
|
||||
|
|
|
|||
|
|
@ -3673,8 +3673,8 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations(IDNode *id_node)
|
|||
}
|
||||
|
||||
#if 0
|
||||
/* NOTE: Relation is disabled since AnimationBackup() is disabled.
|
||||
* See comment in AnimationBackup:init_from_id(). */
|
||||
/* NOTE: Relation is disabled since #AnimationBackup() is disabled.
|
||||
* See comment in #AnimationBackup:init_from_id(). */
|
||||
|
||||
/* Copy-on-eval of write will iterate over f-curves to store current values corresponding
|
||||
* to their RNA path. This means that action must be copied prior to the ID's copy-on-evaluation,
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ void schedule_children(DepsgraphEvalState *state,
|
|||
|
||||
/* Denotes which part of dependency graph is being evaluated. */
|
||||
enum class EvaluationStage {
|
||||
/* Stage 1: Only Copy-on-Write operations are to be evaluated, prior to anything else.
|
||||
/* Stage 1: Only Copy-on-Write operations are to be evaluated, prior to anything else.
|
||||
* This allows other operations to access its dependencies when there is a dependency cycle
|
||||
* involved. */
|
||||
COPY_ON_EVAL,
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ struct ScreenTraceHitData {
|
|||
* artifact when steps are too large.
|
||||
* \param roughness: Determine how lower depth mipmaps are used to make the tracing faster. Lower
|
||||
* roughness will use lower mipmaps.
|
||||
* \param discard_backface: If true, ray-trace will return false if we hit a surface from behind.
|
||||
* \param discard_backface: If true, ray-trace will return false if we hit a surface from behind.
|
||||
* \param allow_self_intersection: If false, ray-trace will return false if the ray is not covering
|
||||
* at least one pixel.
|
||||
* \param ray: View-space ray. Direction pre-multiplied by maximum length.
|
||||
|
|
|
|||
|
|
@ -1295,7 +1295,7 @@ static void draw_points(const Armatures::DrawContext *ctx,
|
|||
}
|
||||
}
|
||||
|
||||
/* Draw tip point */
|
||||
/* Draw tip point. */
|
||||
if (is_envelope_draw) {
|
||||
drw_shgroup_bone_envelope(ctx,
|
||||
bone.disp_mat(),
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ void main()
|
|||
bg_col = mix(col_low, col_high, screen_uv.y);
|
||||
/* Convert back to linear. */
|
||||
bg_col = pow(bg_col, float3(2.2f));
|
||||
/* Dither to hide low precision buffer. (Could be improved) */
|
||||
/* Dither to hide low precision buffer. (Could be improved) */
|
||||
bg_col += dither();
|
||||
break;
|
||||
case BG_RADIAL: {
|
||||
|
|
@ -68,7 +68,7 @@ void main()
|
|||
|
||||
/* Convert back to linear. */
|
||||
bg_col = pow(bg_col, float3(2.2f));
|
||||
/* Dither to hide low precision buffer. (Could be improved) */
|
||||
/* Dither to hide low precision buffer. (Could be improved). */
|
||||
bg_col += dither();
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ SHADER_LIBRARY_CREATE_INFO(draw_view)
|
|||
SHADER_LIBRARY_CREATE_INFO(workbench_composite)
|
||||
SHADER_LIBRARY_CREATE_INFO(workbench_resolve_cavity)
|
||||
|
||||
/* From The Alchemy screen-space ambient obscurance algorithm
|
||||
/* From The Alchemy screen-space ambient obscurance algorithm
|
||||
* http://graphics.cs.williams.edu/papers/AlchemyHPG11/VV11AlchemyAO.pdf */
|
||||
|
||||
#ifdef WORKBENCH_CAVITY
|
||||
|
|
|
|||
|
|
@ -888,7 +888,7 @@ void shear_fcurve_segment(FCurve *fcu,
|
|||
}
|
||||
|
||||
for (int i = segment->start_index; i < segment->start_index + segment->length; i++) {
|
||||
/* For easy calculation of the curve, the values are normalized. */
|
||||
/* For easy calculation of the curve, the values are normalized. */
|
||||
float normalized_x;
|
||||
if (direction == SHEAR_FROM_LEFT) {
|
||||
normalized_x = (fcu->bezt[i].vec[1][0] - left_key->vec[1][0]) / key_x_range;
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ static void add_verts_to_dgroups(ReportList *reports,
|
|||
}
|
||||
else if (BKE_modifiers_findby_type(ob, eModifierType_Subsurf)) {
|
||||
/* Is subdivision-surface on? Lets use the verts on the limit surface then.
|
||||
* = same amount of vertices as mesh, but vertices moved to the
|
||||
* = same amount of vertices as mesh, but vertices moved to the
|
||||
* subdivision-surfaced position, like for 'optimal'. */
|
||||
subsurf_calculate_limit_positions(mesh, verts);
|
||||
vertsfilled = 1;
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ static void cage2d_draw_rect_corner_handles(const rctf *r,
|
|||
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
|
||||
immUniformColor3fv(color);
|
||||
|
||||
/* should really divide by two, but looks too bulky. */
|
||||
/* Should really divide by two, but looks too bulky. */
|
||||
{
|
||||
imm_draw_point_aspect_2d(pos, r->xmin, r->ymin, rad[0], rad[1], solid);
|
||||
imm_draw_point_aspect_2d(pos, r->xmax, r->ymin, rad[0], rad[1], solid);
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ struct uiButDecorator : public uiBut {
|
|||
|
||||
/** Derived struct for #ButType::Progress. */
|
||||
struct uiButProgress : public uiBut {
|
||||
/** Progress in 0..1 range */
|
||||
/** Progress in 0..1 range. */
|
||||
float progress_factor = 0.0f;
|
||||
/** The display style (bar, pie... etc). */
|
||||
blender::ui::ButProgressType progress_type = blender::ui::ButProgressType::Bar;
|
||||
|
|
|
|||
|
|
@ -4784,7 +4784,7 @@ struct FillGridSplitJoin {
|
|||
*
|
||||
* This is done only when there are faces selected. Once split this way, fill_grid will
|
||||
* interpolate using only the data from the selected faces, not the data from the surrounding
|
||||
* faces. This matters for UV edges and face corner colors - the data from the faces being
|
||||
* faces. This matters for UV edges and face corner colors - the data from the faces being
|
||||
* replaced is the right data to use for the interpolation. This relies on the fact that the
|
||||
* "exterior" edge of an island is topologically the same as the "interior" edge around a hole.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -593,7 +593,7 @@ static bool key_test_depth(const PEData *data, const float co[3], const int scre
|
|||
return true;
|
||||
}
|
||||
|
||||
/* used to calculate here but all callers have the screen_co already, so pass as arg */
|
||||
/* used to calculate here but all callers have the screen_co already, so pass as arg */
|
||||
#if 0
|
||||
if (ED_view3d_project_int_global(data->vc.region,
|
||||
co,
|
||||
|
|
|
|||
|
|
@ -654,7 +654,7 @@ static wmOperatorStatus fluid_free_exec(bContext *C, wmOperator *op)
|
|||
|
||||
WM_locked_interface_set_with_flags(CTX_wm_manager(C), REGION_DRAW_LOCK_BAKING);
|
||||
|
||||
/* Free Fluid Geometry */
|
||||
/* Free Fluid Geometry. */
|
||||
WM_jobs_start(CTX_wm_manager(C), wm_job);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ struct EraseOperationExecutor {
|
|||
* \param radius_2: squared radius of the circle.
|
||||
*
|
||||
* \param r_mu0: (output) signed distance from \a s0 to the first intersection, if it exists.
|
||||
* \param r_mu1: (output) signed distance from \a s0 to the second intersection, if it exists.
|
||||
* \param r_mu1: (output) signed distance from \a s0 to the second intersection, if it exists.
|
||||
*
|
||||
* All intersections with the infinite line of the segment are considered.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -2416,7 +2416,7 @@ static void outliner_orphans_purge_ui(bContext * /*C*/, wmOperator *op)
|
|||
uiLayout *layout = op->layout;
|
||||
PointerRNA *ptr = op->ptr;
|
||||
if (!op->customdata) {
|
||||
/* This should only happen on 'adjust last operation' case, since `invoke` will not have been
|
||||
/* This should only happen on 'adjust last operation' case, since `invoke` will not have been
|
||||
* called then before showing the UI (the 'redo panel' UI uses WM-stored operator properties
|
||||
* and a newly-created operator).
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1051,7 +1051,7 @@ static void sequencer_add_movie_sync_sound_strip(
|
|||
strip_sound->len = std::max(strip_movie->len, strip_sound->len);
|
||||
|
||||
/* Ensure that length matches the movie strip even if the underlying sound data
|
||||
* doesn't match up (e.g. it is longer). */
|
||||
* doesn't match up (e.g. it is longer). */
|
||||
seq::time_right_handle_frame_set(
|
||||
scene, strip_sound, seq::time_right_handle_frame_get(scene, strip_movie));
|
||||
seq::time_left_handle_frame_set(
|
||||
|
|
|
|||
|
|
@ -706,7 +706,7 @@ static void slip_strips_delta(wmOperator *op, Scene *scene, SlipData *data, cons
|
|||
seq::relations_invalidate_cache(scene, strip);
|
||||
|
||||
strip->runtime.flag &= ~(STRIP_CLAMPED_LH | STRIP_CLAMPED_RH);
|
||||
/* Reconstruct handle clamp state from first principles. */
|
||||
/* Reconstruct handle clamp state from first principles. */
|
||||
if (data->clamp == true) {
|
||||
if (seq::time_left_handle_frame_get(scene, strip) == seq::time_start_frame_get(strip)) {
|
||||
strip->runtime.flag |= STRIP_CLAMPED_LH;
|
||||
|
|
@ -1909,7 +1909,7 @@ void SEQUENCER_OT_delete(wmOperatorType *ot)
|
|||
/* Flags. */
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
/* Properties. */
|
||||
/* Properties. */
|
||||
ot->prop = RNA_def_boolean(ot->srna,
|
||||
"delete_data",
|
||||
false,
|
||||
|
|
|
|||
|
|
@ -1903,7 +1903,7 @@ static wmOperatorStatus sequencer_select_handles_exec(bContext *C, wmOperator *o
|
|||
}
|
||||
}
|
||||
}
|
||||
/* Select strips */
|
||||
/* Select strips. */
|
||||
LISTBASE_FOREACH (Strip *, strip, ed->seqbasep) {
|
||||
if ((strip->flag & SEQ_LEFTSEL) || (strip->flag & SEQ_RIGHTSEL)) {
|
||||
if (!(strip->flag & SELECT)) {
|
||||
|
|
|
|||
|
|
@ -2063,7 +2063,7 @@ static void recalcData_mesh(TransInfo *t)
|
|||
{
|
||||
if (t->mode == TFM_NORMAL_ROTATION) {
|
||||
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
|
||||
/* The Rotate Normal mode uses a custom array and ignores any elements created for the mesh
|
||||
/* The Rotate Normal mode uses a custom array and ignores any elements created for the mesh
|
||||
* in transData and similar structures. */
|
||||
DEG_id_tag_update(static_cast<ID *>(tc->obedit->data), ID_RECALC_GEOMETRY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ static void create_trans_seq_clamp_data(TransInfo *t, const Scene *scene)
|
|||
|
||||
/* Ensure start transition key cannot pass the previous key, or linked end transition key
|
||||
* cannot pass the next key. This transform behavior is symmetrical and limited by the
|
||||
* smallest distance between keys.*/
|
||||
* smallest distance between keys. */
|
||||
const int max_offset = min_ii(key_start->strip_frame_index - key_prev->strip_frame_index - 1,
|
||||
key_next->strip_frame_index - key_end->strip_frame_index - 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -103,12 +103,12 @@ static Vector2 *V2Negate(Vector2 *v)
|
|||
return v;
|
||||
}
|
||||
|
||||
/* GenerateBezier:
|
||||
* Use least-squares method to find Bezier control points for region.
|
||||
* Vector2 *d; Array of digitized points
|
||||
* int first, last; Indices defining region
|
||||
* double *uPrime; Parameter values for region
|
||||
* Vector2 tHat1, tHat2; Unit tangents at endpoints
|
||||
/* GenerateBezier:
|
||||
* Use least-squares method to find Bezier control points for region.
|
||||
* Vector2 *d; Array of digitized points
|
||||
* int first, last; Indices defining region
|
||||
* double *uPrime; Parameter values for region
|
||||
* Vector2 tHat1, tHat2; Unit tangents at endpoints
|
||||
*/
|
||||
static BezierCurve GenerateBezier(
|
||||
Vector2 *d, int first, int last, double *uPrime, Vector2 tHat1, Vector2 tHat2)
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ class IncreasingThicknessShader : public StrokeShader {
|
|||
};
|
||||
|
||||
/** [ Thickness shader ].
|
||||
* Same as previous but here we allow the user to control the ratio thickness/length so that we
|
||||
* Same as previous but here we allow the user to control the ratio thickness/length so that we
|
||||
* don't get fat short lines
|
||||
*/
|
||||
class ConstrainedIncreasingThicknessShader : public StrokeShader {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class UnaryPredicate1D {
|
|||
|
||||
/** The () operator. Must be overload by inherited classes.
|
||||
* \param inter:
|
||||
* The Interface1D on which we wish to evaluate the predicate.
|
||||
* The Interface1D on which we wish to evaluate the predicate.
|
||||
* \return true if the condition is satisfied, false otherwise.
|
||||
*/
|
||||
virtual int operator()(Interface1D &inter);
|
||||
|
|
|
|||
|
|
@ -86,19 +86,19 @@ class SVertex : public Interface0D {
|
|||
return _Point3D;
|
||||
}
|
||||
|
||||
/** Returns the projected 3D x coordinate of the vertex. */
|
||||
/** Returns the projected 3D x coordinate of the vertex. */
|
||||
virtual real getProjectedX() const
|
||||
{
|
||||
return _Point2D.x();
|
||||
}
|
||||
|
||||
/** Returns the projected 3D y coordinate of the vertex. */
|
||||
/** Returns the projected 3D y coordinate of the vertex. */
|
||||
virtual real getProjectedY() const
|
||||
{
|
||||
return _Point2D.y();
|
||||
}
|
||||
|
||||
/** Returns the projected 3D z coordinate of the vertex. */
|
||||
/** Returns the projected 3D z coordinate of the vertex. */
|
||||
virtual real getProjectedZ() const
|
||||
{
|
||||
return _Point2D.z();
|
||||
|
|
@ -451,8 +451,8 @@ class SVertex : public Interface0D {
|
|||
class ViewEdge;
|
||||
|
||||
/** Base Class for feature edges.
|
||||
* This FEdge can represent a silhouette, a crease, a ridge/valley, a border or a suggestive
|
||||
* contour. For silhouettes, the FEdge is oriented such as, the visible face lies on the left of
|
||||
* This FEdge can represent a silhouette, a crease, a ridge/valley, a border or a suggestive
|
||||
* contour. For silhouettes, the FEdge is oriented such as, the visible face lies on the left of
|
||||
* the edge. For borders, the FEdge is oriented such as, the face lies on the left of the edge. An
|
||||
* FEdge can represent an initial edge of the mesh or runs across a face of the initial mesh
|
||||
* depending on the smoothness or sharpness of the mesh. This class is specialized into a smooth
|
||||
|
|
@ -1206,7 +1206,7 @@ class FEdgeSharp : public FEdge {
|
|||
return _bFrsMaterialIndex;
|
||||
}
|
||||
|
||||
/** Returns the material of the face lying on the left of the FEdge. */
|
||||
/** Returns the material of the face lying on the left of the FEdge. */
|
||||
const FrsMaterial &bFrsMaterial() const;
|
||||
|
||||
/** Returns the face mark of the face lying on the right of the FEdge.
|
||||
|
|
|
|||
|
|
@ -405,13 +405,13 @@ class TVertex : public ViewVertex {
|
|||
return _FrontSVertex->getPoint3D();
|
||||
}
|
||||
|
||||
/** Returns the projected 3D x coordinate of the vertex. */
|
||||
/** Returns the projected 3D x coordinate of the vertex. */
|
||||
virtual real getProjectedX() const
|
||||
{
|
||||
return _FrontSVertex->point2D().x();
|
||||
}
|
||||
|
||||
/** Returns the projected 3D y coordinate of the vertex. */
|
||||
/** Returns the projected 3D y coordinate of the vertex. */
|
||||
virtual real getProjectedY() const
|
||||
{
|
||||
return _FrontSVertex->point2D().y();
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ struct RealizeInstancesOptions {
|
|||
};
|
||||
|
||||
/**
|
||||
* Allow the user to choice which instances to realize and to what depth.
|
||||
* Allow the user to choice which instances to realize and to what depth.
|
||||
*/
|
||||
struct VariedDepthOptions {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -626,7 +626,7 @@ static void copy_or_interp_loop_attributes(Mesh *dest_mesh,
|
|||
const CustomData *source_cd = &orig_me->corner_data;
|
||||
if (orig_loop_index == -1) {
|
||||
/* Will need interpolation weights for this loop's vertex's coordinates.
|
||||
* The coordinate needs to be projected into 2d, just like the interpolating face's
|
||||
* The coordinate needs to be projected into 2d, just like the interpolating face's
|
||||
* coordinates were. The `dest_mesh` coordinates are already in object 0 local space. */
|
||||
float co[2];
|
||||
mul_v2_m3v3(co, axis_mat, dst_positions[dst_corner_verts[loop_index]]);
|
||||
|
|
|
|||
|
|
@ -1058,8 +1058,8 @@ static void pack_islands_optimal_pack(const Span<std::unique_ptr<UVAABBIsland>>
|
|||
if (island_count_patch == 66) {
|
||||
island_count_patch = 67; /* TODO, Stenlund 1980. */
|
||||
}
|
||||
/* See https://www.combinatorics.org/files/Surveys/ds7/ds7v5-2009/ds7-2009.html
|
||||
* https://erich-friedman.github.io/packing/squinsqu */
|
||||
/* See https://www.combinatorics.org/files/Surveys/ds7/ds7v5-2009/ds7-2009.html
|
||||
* https://erich-friedman.github.io/packing/squinsqu */
|
||||
for (int a = 1; a < 20; a++) {
|
||||
int n = a * a + a + 3 + floorf((a - 1) * sqrtf(2.0f));
|
||||
if (island_count_patch == n) {
|
||||
|
|
|
|||
|
|
@ -1613,7 +1613,7 @@ class Preprocessor {
|
|||
bool first = true;
|
||||
for (SharedVar &var : shared_vars_) {
|
||||
char sep = first ? ' ' : ',';
|
||||
/* */
|
||||
|
||||
args << sep << "threadgroup " << var.type << "(&_" << var.name << ")" << var.array;
|
||||
assign << (first ? ':' : ',') << var.name << "(_" << var.name << ")";
|
||||
declare << "threadgroup " << var.type << ' ' << var.name << var.array << ";";
|
||||
|
|
|
|||
|
|
@ -1374,9 +1374,11 @@ struct ShaderCreateInfo {
|
|||
* NOTE: These functions can be exposed as a pass-through on unsupported configurations.
|
||||
* \{ */
|
||||
|
||||
/* \name mtl_max_total_threads_per_threadgroup
|
||||
* \a max_total_threads_per_threadgroup - Provides compiler hint for maximum threadgroup size up
|
||||
* front. Maximum value is 1024. */
|
||||
/**
|
||||
* \name mtl_max_total_threads_per_threadgroup
|
||||
* \a max_total_threads_per_threadgroup - Provides compiler hint for maximum threadgroup size up
|
||||
* front. Maximum value is 1024.
|
||||
*/
|
||||
Self &mtl_max_total_threads_per_threadgroup(ushort max_total_threads_per_threadgroup)
|
||||
{
|
||||
# ifdef WITH_METAL_BACKEND
|
||||
|
|
|
|||
|
|
@ -1762,7 +1762,7 @@ MTLRenderPassDescriptor *MTLFrameBuffer::bake_render_pass_descriptor(bool load_c
|
|||
framebuffer_descriptor_[descriptor_config].depthAttachment.texture = nil;
|
||||
}
|
||||
|
||||
/* Stencil attachment. */
|
||||
/* Stencil attachment. */
|
||||
if (mtl_stencil_attachment_.used) {
|
||||
framebuffer_descriptor_[descriptor_config].stencilAttachment.texture =
|
||||
(id<MTLTexture>)mtl_stencil_attachment_.texture->get_metal_handle_base();
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@ class MTLShaderCompiler : public ShaderCompiler {
|
|||
|
||||
/* Vertex format conversion.
|
||||
* Determines whether it is possible to resize a vertex attribute type
|
||||
* during input assembly. A conversion is implied by the difference
|
||||
* during input assembly. A conversion is implied by the difference
|
||||
* between the input vertex descriptor (from MTLBatch/MTLImmediate)
|
||||
* and the type specified in the shader source.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ static bool parse_version(const std::string &version,
|
|||
return false;
|
||||
}
|
||||
|
||||
/* Try to check if the driver is older than 22.6.1, preferring false positives. */
|
||||
/** Try to check if the driver is older than 22.6.1, preferring false positives. */
|
||||
static bool is_bad_AMD_driver(const char *version_cstr)
|
||||
{
|
||||
std::string version_str = version_cstr;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
#if (LIBAVFORMAT_VERSION_MAJOR < 59)
|
||||
/* For versions older than FFMPEG 5.0, use the old channel layout variables.
|
||||
* We intend to only keep this workaround for around two releases (3.5, 3.6).
|
||||
* We intend to only keep this workaround for around two releases (3.5, 3.6).
|
||||
* If it sticks around any longer, then we should consider refactoring this.
|
||||
*/
|
||||
# define FFMPEG_USE_OLD_CHANNEL_VARS
|
||||
|
|
@ -139,7 +139,7 @@ int64_t av_get_pts_from_frame(AVFrame *picture)
|
|||
return timestamp_from_pts_or_dts(picture->pts, picture->pkt_dts);
|
||||
}
|
||||
|
||||
/* Duration of the frame, in the same units as pts. 0 if unknown. */
|
||||
/* Duration of the frame, in the same units as pts. 0 if unknown. */
|
||||
FFMPEG_INLINE
|
||||
int64_t av_get_frame_duration_in_pts_units(const AVFrame *picture)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#ifdef _MSC_VER
|
||||
/* This needs to be included first to prevent ffmpegs headers adding defines for various math
|
||||
* constants leading to duplicate definitions.*/
|
||||
* constants leading to duplicate definitions. */
|
||||
# define _USE_MATH_DEFINES
|
||||
# include <cmath>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ class GPUShaderBinder {
|
|||
/**
|
||||
* Unbind previously bound GPU shader.
|
||||
*
|
||||
* If the shader was not bound by neither display_bind() nor
|
||||
* If the shader was not bound by neither display_bind() nor
|
||||
* to_scene_linear_bind() the behavior is undefined.
|
||||
*/
|
||||
void unbind() const;
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ static void process_source(std::string &source)
|
|||
/* Comparison operator in Metal returns per-element comparison and returns a vector of booleans.
|
||||
* Need a special syntax to see if two vec3 are matched.
|
||||
*
|
||||
* NOTE: The replacement is optimized for transforming code generated by
|
||||
* NOTE: The replacement is optimized for transforming code generated by
|
||||
* GradingPrimaryTransform. A more general approach is possible, but for now prefer processing
|
||||
* speed.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ static bool color_space_is_invertible(const OCIO_NAMESPACE::ConstColorSpaceRcPtr
|
|||
}
|
||||
|
||||
if (ocio_color_space->getTransform(OCIO_NAMESPACE::COLORSPACE_DIR_TO_REFERENCE)) {
|
||||
/* if there's defined transform to reference space, color space could be converted to scene
|
||||
/* if there's defined transform to reference space, color space could be converted to scene
|
||||
* linear. */
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class LibOCIOColorSpace : public ColorSpace {
|
|||
std::string clean_description_;
|
||||
bool is_invertible_ = false;
|
||||
|
||||
/* Mutable because they are lazily initialized and cached from the is_scene_linear() and
|
||||
/* Mutable because they are lazily initialized and cached from the is_scene_linear() and
|
||||
* is_srgb(). */
|
||||
mutable bool is_info_cached_ = false;
|
||||
mutable bool is_scene_linear_ = false;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ struct ImportSettings {
|
|||
bool is_sequence = false;
|
||||
bool set_frame_range = false;
|
||||
|
||||
/* Min and max frame detected from file sequences. */
|
||||
/* Min and max frame detected from file sequences. */
|
||||
int sequence_min_frame = 0;
|
||||
int sequence_max_frame = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@
|
|||
|
||||
struct Mesh;
|
||||
|
||||
/* Binary STL spec.:
|
||||
* UINT8[80] - Header - 80 bytes
|
||||
* UINT32 - Number of triangles - 4 bytes
|
||||
/* Binary STL spec.:
|
||||
* - UINT8[80] - Header - 80 bytes
|
||||
* - UINT32 - Number of triangles - 4 bytes
|
||||
* For each triangle - 50 bytes:
|
||||
* REAL32[3] - Normal vector - 12 bytes
|
||||
* REAL32[3] - Vertex 1 - 12 bytes
|
||||
* REAL32[3] - Vertex 2 - 12 bytes
|
||||
* REAL32[3] - Vertex 3 - 12 bytes
|
||||
* UINT16 - Attribute byte count - 2 bytes
|
||||
* - REAL32[3] - Normal vector - 12 bytes
|
||||
* - REAL32[3] - Vertex 1 - 12 bytes
|
||||
* - REAL32[3] - Vertex 2 - 12 bytes
|
||||
* - REAL32[3] - Vertex 3 - 12 bytes
|
||||
* - UINT16 - Attribute byte count - 2 bytes
|
||||
*/
|
||||
|
||||
namespace blender::io::stl {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* SPDX-FileCopyrightText: 2023 NVIDIA Corporation. All rights reserved.
|
||||
/* SPDX-FileCopyrightText: 2023 NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
#pragma once
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* SPDX-FileCopyrightText: 2025 NVIDIA Corporation. All rights reserved.
|
||||
/* SPDX-FileCopyrightText: 2025 NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
#pragma once
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ void USDMeshReader::read_object_data(Main *bmain, const pxr::UsdTimeCode time)
|
|||
bool USDMeshReader::topology_changed(const Mesh *existing_mesh, const pxr::UsdTimeCode time)
|
||||
{
|
||||
/* TODO(makowalski): Is it the best strategy to cache the mesh
|
||||
* geometry in this function? This needs to be revisited. */
|
||||
* geometry in this function? This needs to be revisited. */
|
||||
|
||||
mesh_prim_.GetFaceVertexIndicesAttr().Get(&face_indices_, time);
|
||||
mesh_prim_.GetFaceVertexCountsAttr().Get(&face_counts_, time);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class OBJCurvesTest : public testing::Test {
|
|||
/* BKE_id_free() hits a code path that uses CLOG, which crashes if not initialized properly. */
|
||||
CLG_init();
|
||||
|
||||
/* Might not be necessary but...*/
|
||||
/* Might not be necessary but... */
|
||||
BKE_idtype_init();
|
||||
}
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ TEST_F(OBJCurvesTest, nurbs_io_uniform_polyline)
|
|||
run_nurbs_test(positions, order, mode, cyclic, src, result, positions, &expected_mode);
|
||||
|
||||
/* Validate uniform knots, don't do this in general as it only verifies the knot generator
|
||||
* `bke::curves::nurbs::calculate_knots`. */
|
||||
* `bke::curves::nurbs::calculate_knots`. */
|
||||
Vector<float> knot_buffer(bke::curves::nurbs::knots_num(positions.size(), order, cyclic));
|
||||
bke::curves::nurbs::calculate_knots(positions.size(), mode, order, cyclic, knot_buffer);
|
||||
const Vector<int> multiplicity = bke::curves::nurbs::calculate_multiplicity_sequence(
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ typedef struct BPoint {
|
|||
float tilt;
|
||||
/** Used for softbody goal weight. */
|
||||
float weight;
|
||||
/** F1: selection status, hide: is point hidden or not. */
|
||||
/** F1: selection status, hide: is point hidden or not. */
|
||||
uint8_t f1;
|
||||
char _pad1[1];
|
||||
short hide;
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ typedef struct Mesh {
|
|||
blender::MutableSpan<int> face_offsets_for_write();
|
||||
|
||||
/**
|
||||
* Array of vertices for every face corner, stored in the ".corner_vert" integer attribute.
|
||||
* Array of vertices for every face corner, stored in the ".corner_vert" integer attribute.
|
||||
* For example, the vertices in a face can be retrieved with the #slice method:
|
||||
* \code{.cc}
|
||||
* const Span<int> face_verts = corner_verts.slice(face);
|
||||
|
|
|
|||
|
|
@ -302,10 +302,10 @@ typedef struct MEdge {
|
|||
/** #MEdge.flag */
|
||||
enum {
|
||||
/** Deprecated selection status. Now stored in ".select_edge" attribute. */
|
||||
/* SELECT = (1 << 0), */
|
||||
// SELECT = (1 << 0),
|
||||
ME_SEAM = (1 << 2),
|
||||
/** Deprecated hide status. Now stored in ".hide_edge" attribute. */
|
||||
/* ME_HIDE = (1 << 4), */
|
||||
// ME_HIDE = (1 << 4),
|
||||
/** Deprecated loose edge status. Now stored in #Mesh::loose_edges() runtime cache. */
|
||||
ME_LOOSEEDGE = (1 << 7),
|
||||
/** Deprecated sharp edge status. Now stored in "sharp_edge" attribute. */
|
||||
|
|
@ -336,7 +336,7 @@ enum {
|
|||
/** Deprecated selection status. Now stored in ".select_poly" attribute. */
|
||||
ME_FACE_SEL = (1 << 1),
|
||||
/** Deprecated hide status. Now stored in ".hide_poly" attribute. */
|
||||
/* ME_HIDE = (1 << 4), */
|
||||
// ME_HIDE = (1 << 4),
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -375,7 +375,7 @@ typedef struct MVert {
|
|||
/** #MVert.flag */
|
||||
enum {
|
||||
/** Deprecated selection status. Now stored in ".select_vert" attribute. */
|
||||
/* SELECT = (1 << 0), */
|
||||
// SELECT = (1 << 0),
|
||||
/** Deprecated hide status. Now stored in ".hide_vert" attribute. */
|
||||
ME_HIDE = (1 << 4),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1420,7 +1420,7 @@ typedef enum {
|
|||
MOD_SCREW_NORMAL_FLIP = (1 << 0),
|
||||
MOD_SCREW_NORMAL_CALC = (1 << 1),
|
||||
MOD_SCREW_OBJECT_OFFSET = (1 << 2),
|
||||
/* MOD_SCREW_OBJECT_ANGLE = (1 << 4), */
|
||||
// MOD_SCREW_OBJECT_ANGLE = (1 << 4),
|
||||
MOD_SCREW_SMOOTH_SHADING = (1 << 5),
|
||||
MOD_SCREW_UV_STRETCH_U = (1 << 6),
|
||||
MOD_SCREW_UV_STRETCH_V = (1 << 7),
|
||||
|
|
@ -2101,7 +2101,7 @@ typedef enum {
|
|||
typedef enum {
|
||||
MOD_MESHCACHE_INTERP_NONE = 0,
|
||||
MOD_MESHCACHE_INTERP_LINEAR = 1,
|
||||
/* MOD_MESHCACHE_INTERP_CARDINAL = 2, */
|
||||
// MOD_MESHCACHE_INTERP_CARDINAL = 2,
|
||||
} MeshCacheModifierInterpolation;
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -565,8 +565,6 @@ enum {
|
|||
R_IMF_FLAG_PREVIEW_JPG = 1 << 1,
|
||||
};
|
||||
|
||||
/* */
|
||||
|
||||
/**
|
||||
* #ImageFormatData::depth
|
||||
*
|
||||
|
|
@ -859,8 +857,8 @@ typedef struct RenderData {
|
|||
float bake_biasdist, bake_user_scale;
|
||||
|
||||
/**
|
||||
* Path to render output.
|
||||
* \note Excluded from `BKE_bpath_foreach_path_` / `scene_foreach_path` code.
|
||||
* Path to render output.
|
||||
* \note Excluded from `BKE_bpath_foreach_path_` / `scene_foreach_path` code.
|
||||
*/
|
||||
char pic[/*FILE_MAX*/ 1024];
|
||||
|
||||
|
|
|
|||
|
|
@ -651,7 +651,7 @@ ENUM_OPERATORS(eFileSel_File_Types, FILE_TYPE_BLENDERLIB);
|
|||
|
||||
/** Selection Flags #FileList::selection_state. */
|
||||
typedef enum eDirEntry_SelectFlag {
|
||||
/* FILE_SEL_ACTIVE = (1 << 1), */ /* UNUSED */
|
||||
// FILE_SEL_ACTIVE = (1 << 1), /* UNUSED */
|
||||
FILE_SEL_HIGHLIGHTED = (1 << 2),
|
||||
FILE_SEL_SELECTED = (1 << 3),
|
||||
FILE_SEL_EDITING = (1 << 4),
|
||||
|
|
@ -924,7 +924,7 @@ typedef enum eSpaceClip_Flag {
|
|||
SC_SHOW_FILTERS = (1 << 13),
|
||||
SC_SHOW_GRAPH_FRAMES = (1 << 14),
|
||||
SC_SHOW_GRAPH_TRACKS_MOTION = (1 << 15),
|
||||
/* SC_SHOW_PYRAMID_LEVELS = (1 << 16), */ /* UNUSED */
|
||||
// SC_SHOW_PYRAMID_LEVELS = (1 << 16), /* UNUSED */
|
||||
SC_LOCK_TIMECURSOR = (1 << 17),
|
||||
SC_SHOW_SECONDS = (1 << 18),
|
||||
SC_SHOW_GRAPH_SEL_ONLY = (1 << 19),
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@
|
|||
*/
|
||||
typedef enum eUIFont_ID {
|
||||
UIFONT_DEFAULT = 0,
|
||||
/* UIFONT_BITMAP = 1 */ /* UNUSED */
|
||||
// UIFONT_BITMAP = 1, /* UNUSED */
|
||||
|
||||
/* free slots */
|
||||
UIFONT_CUSTOM1 = 2,
|
||||
/* UIFONT_CUSTOM2 = 3, */ /* UNUSED */
|
||||
// UIFONT_CUSTOM2 = 3, /* UNUSED */
|
||||
} eUIFont_ID;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ static int add_member(const char *member_name)
|
|||
|
||||
additional_slen_offset = 0;
|
||||
|
||||
if (member_name[0] == 0 /* || (member_name[1] == 0) */) {
|
||||
if (member_name[0] == 0 /* `|| (member_name[1] == 0)` */) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1705,7 +1705,7 @@ static void rna_def_animdata(BlenderRNA *brna)
|
|||
RNA_def_property_update(prop, NC_ANIMATION | ND_NLA_ACTCHANGE, "rna_AnimData_dependency_update");
|
||||
|
||||
/* Temporary action slot for tweak mode. Just like `action_slot_handle` this is needed for
|
||||
* library overrides to work.*/
|
||||
* library overrides to work. */
|
||||
prop = RNA_def_property(srna, "action_slot_handle_tweak_storage", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_int_sdna(prop, nullptr, "tmp_slot_handle");
|
||||
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_EDITABLE);
|
||||
|
|
|
|||
|
|
@ -600,7 +600,7 @@ void RNA_identifier_sanitize(char *identifier, int property)
|
|||
{
|
||||
int a = 0;
|
||||
|
||||
/* list from http://docs.python.org/py3k/reference/lexical_analysis.html#keywords */
|
||||
/* List from: http://docs.python.org/py3k/reference/lexical_analysis.html#keywords */
|
||||
static const char *kwlist[] = {
|
||||
/* "False", "None", "True", */
|
||||
"and", "as", "assert", "break", "class", "continue", "def", "del",
|
||||
|
|
@ -1571,7 +1571,7 @@ void RNA_def_property_flag(PropertyRNA *prop, PropertyFlag flag)
|
|||
{
|
||||
switch (prop->type) {
|
||||
case PROP_ENUM: {
|
||||
/* In some cases the flag will have been set, ignore that case.*/
|
||||
/* In some cases the flag will have been set, ignore that case. */
|
||||
if ((flag & PROP_ENUM_FLAG) && (prop->flag & PROP_ENUM_FLAG) == 0) {
|
||||
EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
|
||||
if (eprop->item) {
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
|
|||
PropertyRNA *parm;
|
||||
FunctionRNA *func;
|
||||
|
||||
/* Surface format */
|
||||
/* Surface format */
|
||||
static const EnumPropertyItem prop_dynamicpaint_surface_format[] = {
|
||||
// {MOD_DPAINT_SURFACE_F_PTEX, "PTEX", ICON_TEXTURE_SHADED, "Ptex", ""},
|
||||
{MOD_DPAINT_SURFACE_F_VERTEX, "VERTEX", ICON_OUTLINER_DATA_MESH, "Vertex", ""},
|
||||
|
|
@ -320,13 +320,13 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
|
|||
{0, nullptr, 0, nullptr, nullptr},
|
||||
};
|
||||
|
||||
/* Surface type - generated dynamically based on surface format */
|
||||
/* Surface type - generated dynamically based on surface format */
|
||||
static const EnumPropertyItem prop_dynamicpaint_surface_type[] = {
|
||||
{MOD_DPAINT_SURFACE_T_PAINT, "PAINT", 0, "Paint", ""},
|
||||
{0, nullptr, 0, nullptr, nullptr},
|
||||
};
|
||||
|
||||
/* Initial color setting */
|
||||
/* Initial color setting */
|
||||
static const EnumPropertyItem prop_dynamicpaint_init_color_type[] = {
|
||||
{MOD_DPAINT_INITIAL_NONE, "NONE", 0, "None", ""},
|
||||
{MOD_DPAINT_INITIAL_COLOR, "COLOR", ICON_COLOR, "Color", ""},
|
||||
|
|
|
|||
|
|
@ -1270,7 +1270,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
|
|||
{FLUID_DOMAIN_CACHE_ALL, "ALL", 0, "All", "Bake all simulation settings at once"},
|
||||
{0, nullptr, 0, nullptr, nullptr}};
|
||||
|
||||
/* OpenVDB data depth - generated dynamically based on domain type */
|
||||
/* OpenVDB data depth - generated dynamically based on domain type. */
|
||||
static const EnumPropertyItem fluid_data_depth_items[] = {
|
||||
{0, "NONE", 0, "", ""},
|
||||
{0, nullptr, 0, nullptr, nullptr},
|
||||
|
|
@ -1307,7 +1307,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
|
|||
{0, nullptr, 0, nullptr, nullptr},
|
||||
};
|
||||
|
||||
/* Cache type - generated dynamically based on domain type */
|
||||
/* Cache type - generated dynamically based on domain type. */
|
||||
static const EnumPropertyItem cache_file_type_items[] = {
|
||||
{FLUID_DOMAIN_FILE_UNI, "UNI", 0, "Uni Cache", "Uni file format (.uni)"},
|
||||
{FLUID_DOMAIN_FILE_OPENVDB, "OPENVDB", 0, "OpenVDB", "OpenVDB file format (.vdb)"},
|
||||
|
|
@ -1899,7 +1899,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
|
|||
"Maximum number of fluid particles that are allowed in this simulation");
|
||||
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_datacache_reset");
|
||||
|
||||
/* viscosity options */
|
||||
/* Viscosity options. */
|
||||
|
||||
prop = RNA_def_property(srna, "use_viscosity", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, nullptr, "flags", FLUID_DOMAIN_USE_VISCOSITY);
|
||||
|
|
@ -1917,7 +1917,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
|
|||
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_AMOUNT);
|
||||
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_datacache_reset");
|
||||
|
||||
/* diffusion options */
|
||||
/* Diffusion options. */
|
||||
|
||||
prop = RNA_def_property(srna, "use_diffusion", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, nullptr, "flags", FLUID_DOMAIN_USE_DIFFUSION);
|
||||
|
|
@ -2022,7 +2022,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
|
|||
"particles). Needs to be adjusted after changing the mesh scale.");
|
||||
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_meshcache_reset");
|
||||
|
||||
/* secondary particles options */
|
||||
/* Secondary particles options. */
|
||||
|
||||
prop = RNA_def_property(srna, "sndparticle_potential_min_wavecrest", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, nullptr, "sndparticle_tau_min_wc");
|
||||
|
|
@ -2684,7 +2684,7 @@ static void rna_def_fluid_flow_settings(BlenderRNA *brna)
|
|||
{0, nullptr, 0, nullptr, nullptr},
|
||||
};
|
||||
|
||||
/* Flow source - generated dynamically based on flow type */
|
||||
/* Flow source - generated dynamically based on flow type. */
|
||||
static const EnumPropertyItem flow_sources[] = {
|
||||
{0, "NONE", 0, "", ""},
|
||||
{0, nullptr, 0, nullptr, nullptr},
|
||||
|
|
|
|||
|
|
@ -4005,21 +4005,21 @@ static void rna_def_sound_equalizer_modifier(BlenderRNA *brna)
|
|||
"min_freq",
|
||||
SOUND_EQUALIZER_DEFAULT_MIN_FREQ,
|
||||
0.0,
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ, /* Hard min and max */
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ, /* Hard min and max */
|
||||
"Minimum Frequency",
|
||||
"Minimum Frequency",
|
||||
0.0,
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ); /* Soft min and max */
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ); /* Soft min and max */
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
|
||||
parm = RNA_def_float(func,
|
||||
"max_freq",
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ,
|
||||
0.0,
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ, /* Hard min and max */
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ, /* Hard min and max */
|
||||
"Maximum Frequency",
|
||||
"Maximum Frequency",
|
||||
0.0,
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ); /* Soft min and max */
|
||||
SOUND_EQUALIZER_DEFAULT_MAX_FREQ); /* Soft min and max */
|
||||
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
|
||||
|
||||
/* return type */
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ static void meshcache_do(MeshCacheModifierData *mcmd,
|
|||
/* apply offset and scale */
|
||||
time = (mcmd->frame_scale * time) - mcmd->frame_start;
|
||||
}
|
||||
else { /* if (mcmd->play_mode == MOD_MESHCACHE_PLAY_EVAL) { */
|
||||
else { /* `if (mcmd->play_mode == MOD_MESHCACHE_PLAY_EVAL) {`. */
|
||||
switch (mcmd->time_mode) {
|
||||
case MOD_MESHCACHE_TIME_FRAME: {
|
||||
time = mcmd->eval_frame;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue