Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +47 -46
13 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a1a9307a7 - Show all commits

4
source/blender/blenkernel/BKE_gpencil_legacy.h
View File

@ -344,7 +344,7 @@ typedef enum eGP_GetFrame_Mode {
/** /**
* Get the appropriate gp-frame from a given layer * Get the appropriate gp-frame from a given layer
* - this sets the layer's actframe var (if allowed to) * - this sets the layer's `actframe` var (if allowed to)
* - extension beyond range (if first gp-frame is after all frame in interest and cannot add) * - extension beyond range (if first gp-frame is after all frame in interest and cannot add)
* *
* \param gpl: Grease pencil layer * \param gpl: Grease pencil layer
@ -523,7 +523,7 @@ struct Material *BKE_gpencil_object_material_new(struct Main *bmain,
int *r_index); int *r_index);
/** /**
* Get material index (0-based like mat_nr not actcol). * Get material index (0-based like mat_nr not #Object::actcol).
* \param ob: Grease pencil object * \param ob: Grease pencil object
* \param ma: Material * \param ma: Material
* \return Index of the material * \return Index of the material

2
source/blender/blenkernel/BKE_mesh.hh
View File

@ -43,7 +43,7 @@ float3 poly_center_calc(Span<float3> vert_positions, Span<MLoop> poly_loops);
/** Calculate the surface area of the polygon described by the indexed vertices. */ /** Calculate the surface area of the polygon described by the indexed vertices. */
float poly_area_calc(Span<float3> vert_positions, Span<MLoop> poly_loops); float poly_area_calc(Span<float3> vert_positions, Span<MLoop> poly_loops);
/** Calculate the angles at each of the polygons's corners. */ /** Calculate the angles at each of the polygons corners. */
void poly_angles_calc(Span<float3> vert_positions, void poly_angles_calc(Span<float3> vert_positions,
Span<MLoop> poly_loops, Span<MLoop> poly_loops,
MutableSpan<float> angles); MutableSpan<float> angles);

2
source/blender/blenkernel/BKE_mesh_remap.h
View File

@ -45,7 +45,7 @@ void BKE_mesh_remap_item_define_invalid(MeshPairRemap *map, int index);
* https://blenderartists.org/t/619105 * https://blenderartists.org/t/619105
* *
* We could also use similar topology mappings inside a same mesh * We could also use similar topology mappings inside a same mesh
* (cf. Campbell's 'select face islands from similar topology' wip work). * (cf. Campbell's 'select face islands from similar topology' WIP work).
* Also, users will have to check, whether we can get rid of some modes here, * Also, users will have to check, whether we can get rid of some modes here,
* not sure all will be useful! * not sure all will be useful!
*/ */

35
source/blender/blenkernel/intern/collection.c
View File

@ -1141,11 +1141,12 @@ static void collection_gobject_hash_ensure_fix(Collection *collection)
/** /**
* Update the collections object hash, removing `ob_old`, inserting `cob->ob` as the new key. * Update the collections object hash, removing `ob_old`, inserting `cob->ob` as the new key.
* *
* \note This function is called fron foreach_id callback, and a difference of Object pointers is * \note This function is called from #IDTypeInfo::foreach_id callback,
* only expected in case ID remapping is happening. This code is the only are in Blender allowed to * and a difference of Object pointers is only expected in case ID remapping is happening.
* (temporarily) leave the CollectionObject list in an inconsistent/invalid state (with NULL object * This code is the only are in Blender allowed to (temporarily) leave the #CollectionObject list
* pointers, or duplicates of CollectionObjects). If such invalid cases are encountered, it will * in an inconsistent/invalid state (with NULL object pointers, or duplicates of
* tag the collection objects list as dirty. * #CollectionObjects). If such invalid cases are encountered,
* it will tag the collection objects list as dirty.
* *
* \param ob_old: The existing key to `cob` in the hash, not removed when NULL. * \param ob_old: The existing key to `cob` in the hash, not removed when NULL.
* \param cob: The `cob->ob` is to be used as the new key, * \param cob: The `cob->ob` is to be used as the new key,
@ -1162,7 +1163,7 @@ static void collection_gobject_hash_update_object(Collection *collection,
if (ob_old) { if (ob_old) {
CollectionObject *cob_old = BLI_ghash_popkey(collection->runtime.gobject_hash, ob_old, NULL); CollectionObject *cob_old = BLI_ghash_popkey(collection->runtime.gobject_hash, ob_old, NULL);
if (cob_old != cob) { if (cob_old != cob) {
/* Old object alredy removed from the ghash. */ /* Old object already removed from the #GHash. */
collection->runtime.tag |= COLLECTION_TAG_COLLECTION_OBJECT_DIRTY; collection->runtime.tag |= COLLECTION_TAG_COLLECTION_OBJECT_DIRTY;
} }
} }
@ -1173,28 +1174,28 @@ static void collection_gobject_hash_update_object(Collection *collection,
*cob_p = cob; *cob_p = cob;
} }
else { else {
/* Duplicate CollectionObject entries. */ /* Duplicate #CollectionObject entries. */
collection->runtime.tag |= COLLECTION_TAG_COLLECTION_OBJECT_DIRTY; collection->runtime.tag |= COLLECTION_TAG_COLLECTION_OBJECT_DIRTY;
} }
} }
else { else {
/* CollectionObject with NULL objetc pointer. */ /* #CollectionObject with NULL object pointer. */
collection->runtime.tag |= COLLECTION_TAG_COLLECTION_OBJECT_DIRTY; collection->runtime.tag |= COLLECTION_TAG_COLLECTION_OBJECT_DIRTY;
} }
} }
/** /**
* Validate the integrity of the collection's CollectionObject list, and of its mapping. * Validate the integrity of the collection's #CollectionObject list, and of its mapping.
* *
* Simple test is very fast, as it only checks that the 'dirty' tag for collection's objects is not * Simple test is very fast, as it only checks that the 'dirty' tag for collection's objects is not
* set. * set.
* *
* The extensive check is expensive. This should not be done from within loops over collections * The extensive check is expensive. This should not be done from within loops over collections
* items, or from low-level operations that can be assumed safe (like adding or removing an object * items, or from low-level operations that can be assumed safe (like adding or removing an object
* from a colleciton). It ensures that: * from a collection). It ensures that:
* - There is a `gobject_hash` mapping. * - There is a `gobject_hash` mapping.
* - There is no NULL-object CollectionObject items. * - There is no NULL-object #CollectionObject items.
* - there is no duplicate CollectionObject items (two or more referencing the same Object). * - there is no duplicate #CollectionObject items (two or more referencing the same Object).
*/ */
static void collection_gobject_assert_internal_consistency(Collection *collection, static void collection_gobject_assert_internal_consistency(Collection *collection,
const bool do_extensive_check) const bool do_extensive_check)
@ -1205,16 +1206,16 @@ static void collection_gobject_assert_internal_consistency(Collection *collectio
} }
if (collection->runtime.gobject_hash == NULL) { if (collection->runtime.gobject_hash == NULL) {
/* NOTE: If the ghash does not exist yet, it's creation will assert on errors, so in theory the /* NOTE: If the `ghash` does not exist yet, it's creation will assert on errors,
* second loop below could be skipped. */ * so in theory the second loop below could be skipped. */
collection_gobject_hash_create(collection); collection_gobject_hash_create(collection);
} }
GHash *gobject_hash = collection->runtime.gobject_hash; GHash *gobject_hash = collection->runtime.gobject_hash;
UNUSED_VARS_NDEBUG(gobject_hash); UNUSED_VARS_NDEBUG(gobject_hash);
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) { LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
BLI_assert(cob->ob != NULL); BLI_assert(cob->ob != NULL);
/* If there are more than one CollectionObject for the same object, at most one of them will /* If there are more than one #CollectionObject for the same object,
* pass this test. */ * at most one of them will pass this test. */
BLI_assert(BLI_ghash_lookup(gobject_hash, cob->ob) == cob); BLI_assert(BLI_ghash_lookup(gobject_hash, cob->ob) == cob);
} }
} }

22
source/blender/blenkernel/intern/fcurve_test.cc
View File

@ -422,7 +422,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
/* All keys. */ /* All keys. */
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, false /* include handles */, NULL /* frame range */, &bounds); fcu, false /* select only */, false /* include handles */, NULL /* frame range */, &bounds);
EXPECT_TRUE(success) << "A non-empty FCurve should have bounds."; EXPECT_TRUE(success) << "A non-empty FCurve should have bounds.";
EXPECT_FLOAT_EQ(fcu->bezt[0].vec[1][0], bounds.xmin); EXPECT_FLOAT_EQ(fcu->bezt[0].vec[1][0], bounds.xmin);
EXPECT_FLOAT_EQ(fcu->bezt[4].vec[1][0], bounds.xmax); EXPECT_FLOAT_EQ(fcu->bezt[4].vec[1][0], bounds.xmax);
@ -431,7 +431,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
/* Only selected. */ /* Only selected. */
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, true /* sel only */, false /* include handles */, NULL /* frame range */, &bounds); fcu, true /* select only */, false /* include handles */, NULL /* frame range */, &bounds);
EXPECT_FALSE(success) EXPECT_FALSE(success)
<< "Using selected keyframes only should not find bounds if nothing is selected."; << "Using selected keyframes only should not find bounds if nothing is selected.";
@ -439,7 +439,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
fcu->bezt[3].f2 |= SELECT; fcu->bezt[3].f2 |= SELECT;
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, true /* sel only */, false /* include handles */, NULL /* frame range */, &bounds); fcu, true /* select only */, false /* include handles */, NULL /* frame range */, &bounds);
EXPECT_TRUE(success) << "Selected keys should have been found."; EXPECT_TRUE(success) << "Selected keys should have been found.";
EXPECT_FLOAT_EQ(fcu->bezt[1].vec[1][0], bounds.xmin); EXPECT_FLOAT_EQ(fcu->bezt[1].vec[1][0], bounds.xmin);
EXPECT_FLOAT_EQ(fcu->bezt[3].vec[1][0], bounds.xmax); EXPECT_FLOAT_EQ(fcu->bezt[3].vec[1][0], bounds.xmax);
@ -448,7 +448,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
/* Including handles. */ /* Including handles. */
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, true /* include handles */, NULL /* frame range */, &bounds); fcu, false /* select only */, true /* include handles */, NULL /* frame range */, &bounds);
EXPECT_TRUE(success) << "A non-empty FCurve should have bounds including handles."; EXPECT_TRUE(success) << "A non-empty FCurve should have bounds including handles.";
EXPECT_FLOAT_EQ(fcu->bezt[0].vec[0][0], bounds.xmin); EXPECT_FLOAT_EQ(fcu->bezt[0].vec[0][0], bounds.xmin);
EXPECT_FLOAT_EQ(fcu->bezt[4].vec[2][0], bounds.xmax); EXPECT_FLOAT_EQ(fcu->bezt[4].vec[2][0], bounds.xmax);
@ -461,13 +461,13 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
range[0] = 25; range[0] = 25;
range[1] = 30; range[1] = 30;
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, false /* include handles */, range /* frame range */, &bounds); fcu, false /* select only */, false /* include handles */, range /* frame range */, &bounds);
EXPECT_FALSE(success) << "A frame range outside the range of keyframes should not find bounds."; EXPECT_FALSE(success) << "A frame range outside the range of keyframes should not find bounds.";
range[0] = 0; range[0] = 0;
range[1] = 18.2f; range[1] = 18.2f;
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, false /* include handles */, range /* frame range */, &bounds); fcu, false /* select only */, false /* include handles */, range /* frame range */, &bounds);
EXPECT_TRUE(success) << "A frame range within the range of keyframes should find bounds."; EXPECT_TRUE(success) << "A frame range within the range of keyframes should find bounds.";
EXPECT_FLOAT_EQ(fcu->bezt[0].vec[1][0], bounds.xmin); EXPECT_FLOAT_EQ(fcu->bezt[0].vec[1][0], bounds.xmin);
EXPECT_FLOAT_EQ(fcu->bezt[3].vec[1][0], bounds.xmax); EXPECT_FLOAT_EQ(fcu->bezt[3].vec[1][0], bounds.xmax);
@ -476,7 +476,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
/* Range and handles. */ /* Range and handles. */
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, true /* include handles */, range /* frame range */, &bounds); fcu, false /* select only */, true /* include handles */, range /* frame range */, &bounds);
EXPECT_TRUE(success) EXPECT_TRUE(success)
<< "A frame range within the range of keyframes should find bounds with handles."; << "A frame range within the range of keyframes should find bounds with handles.";
EXPECT_FLOAT_EQ(fcu->bezt[0].vec[0][0], bounds.xmin); EXPECT_FLOAT_EQ(fcu->bezt[0].vec[0][0], bounds.xmin);
@ -488,7 +488,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
range[0] = 8.0f; range[0] = 8.0f;
range[1] = 18.2f; range[1] = 18.2f;
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, true /* sel only */, true /* include handles */, range /* frame range */, &bounds); fcu, true /* select only */, true /* include handles */, range /* frame range */, &bounds);
EXPECT_TRUE(success) EXPECT_TRUE(success)
<< "A frame range within the range of keyframes should find bounds of selected keyframes."; << "A frame range within the range of keyframes should find bounds of selected keyframes.";
EXPECT_FLOAT_EQ(fcu->bezt[3].vec[0][0], bounds.xmin); EXPECT_FLOAT_EQ(fcu->bezt[3].vec[0][0], bounds.xmin);
@ -502,7 +502,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
fcurve_store_samples(fcu, NULL, sample_start, sample_end, fcurve_samplingcb_evalcurve); fcurve_store_samples(fcu, NULL, sample_start, sample_end, fcurve_samplingcb_evalcurve);
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, false /* include handles */, NULL /* frame range */, &bounds); fcu, false /* select only */, false /* include handles */, NULL /* frame range */, &bounds);
EXPECT_TRUE(success) << "FCurve samples should have a range."; EXPECT_TRUE(success) << "FCurve samples should have a range.";
EXPECT_FLOAT_EQ(sample_start, bounds.xmin); EXPECT_FLOAT_EQ(sample_start, bounds.xmin);
@ -513,7 +513,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
range[0] = 8.0f; range[0] = 8.0f;
range[1] = 20.0f; range[1] = 20.0f;
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, false /* include handles */, range /* frame range */, &bounds); fcu, false /* select only */, false /* include handles */, range /* frame range */, &bounds);
EXPECT_TRUE(success) << "FCurve samples should have a range."; EXPECT_TRUE(success) << "FCurve samples should have a range.";
EXPECT_FLOAT_EQ(range[0], bounds.xmin); EXPECT_FLOAT_EQ(range[0], bounds.xmin);
@ -524,7 +524,7 @@ TEST(BKE_fcurve, BKE_fcurve_calc_bounds)
range[0] = 20.1f; range[0] = 20.1f;
range[1] = 30.0f; range[1] = 30.0f;
success = BKE_fcurve_calc_bounds( success = BKE_fcurve_calc_bounds(
fcu, false /* sel only */, false /* include handles */, range /* frame range */, &bounds); fcu, false /* select only */, false /* include handles */, range /* frame range */, &bounds);
EXPECT_FALSE(success) EXPECT_FALSE(success)
<< "A frame range outside the range of keyframe samples should not have bounds."; << "A frame range outside the range of keyframe samples should not have bounds.";

4
source/blender/blenkernel/intern/gpencil_curve_legacy.c
View File

@ -368,7 +368,7 @@ static void gpencil_convert_spline(Main *bmain,
if ((nu->flagu & CU_NURB_CYCLIC) == 0) { if ((nu->flagu & CU_NURB_CYCLIC) == 0) {
segments--; segments--;
} }
/* Get all interpolated curve points of Beziert */ /* Get all interpolated curve points of Bezier. */
for (int s = 0; s < segments; s++) { for (int s = 0; s < segments; s++) {
int inext = (s + 1) % nu->pntsu; int inext = (s + 1) % nu->pntsu;
BezTriple *prevbezt = &nu->bezt[s]; BezTriple *prevbezt = &nu->bezt[s];
@ -915,7 +915,7 @@ static float *gpencil_stroke_points_from_editcurve_adaptive_resolu(
bool is_cyclic, bool is_cyclic,
int *r_points_len) int *r_points_len)
{ {
/* One stride contains: x, y, z, pressure, strength, Vr, Vg, Vb, Vmix_factor */ /* One stride contains: `x, y, z, pressure, strength, Vr, Vg, Vb, Vmix_factor`. */
const uint stride = sizeof(float[9]); const uint stride = sizeof(float[9]);
const uint cpt_last = curve_point_array_len - 1; const uint cpt_last = curve_point_array_len - 1;
const uint num_segments = (is_cyclic) ? curve_point_array_len : curve_point_array_len - 1; const uint num_segments = (is_cyclic) ? curve_point_array_len : curve_point_array_len - 1;

8
source/blender/blenkernel/intern/gpencil_legacy.c
View File

@ -191,7 +191,7 @@ void BKE_gpencil_blend_read_data(BlendDataReader *reader, bGPdata *gpd)
BLO_read_data_address(reader, &gpd->adt); BLO_read_data_address(reader, &gpd->adt);
BKE_animdata_blend_read_data(reader, gpd->adt); BKE_animdata_blend_read_data(reader, gpd->adt);
/* Ensure full objectmode for linked grease pencil. */ /* Ensure full object-mode for linked grease pencil. */
if (ID_IS_LINKED(gpd)) { if (ID_IS_LINKED(gpd)) {
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
@ -1364,9 +1364,9 @@ bGPDframe *BKE_gpencil_layer_frame_get(bGPDlayer *gpl, int cframe, eGP_GetFrame_
gpl->actframe = gpl->frames.first; gpl->actframe = gpl->frames.first;
} }
else { else {
/* unresolved errogenous situation! */ /* Unresolved erogenous situation! */
CLOG_STR_ERROR(&LOG, "cannot find appropriate gp-frame"); CLOG_STR_ERROR(&LOG, "cannot find appropriate gp-frame");
/* gpl->actframe should still be NULL */ /* `gpl->actframe` should still be NULL. */
} }
} }
} }
@ -2324,7 +2324,7 @@ bool BKE_gpencil_from_image(
pt->strength = 1.0f - color[3]; pt->strength = 1.0f - color[3];
} }
/* Selet Alpha points. */ /* Select Alpha points. */
if (pt->strength < 0.03f) { if (pt->strength < 0.03f) {
gps->flag |= GP_STROKE_SELECT; gps->flag |= GP_STROKE_SELECT;
pt->flag |= GP_SPOINT_SELECT; pt->flag |= GP_SPOINT_SELECT;

2
source/blender/blenlib/BLI_math_angle_types.hh
View File

@ -309,7 +309,7 @@ template<typename T> struct AngleCartesianBase {
math::sqrt((T(1) - a.cos_) / T(2))}; math::sqrt((T(1) - a.cos_) / T(2))};
/* Recover sign only for sine. Cosine of half angle is given to be positive or 0 since the /* Recover sign only for sine. Cosine of half angle is given to be positive or 0 since the
* angle stored in #AngleCartesianBase is in the range [-pi..pi]. */ * angle stored in #AngleCartesianBase is in the range [-pi..pi]. */
/* TODO(fclem): Could use copysign here. */ /* TODO(fclem): Could use `copysign` here. */
if (a.sin_ < T(0)) { if (a.sin_ < T(0)) {
result.sin_ = -result.sin_; result.sin_ = -result.sin_;
} }

2
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -1307,7 +1307,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
/* Cannot call stuff now (pointers!), done in #setup_app_data. */ /* Cannot call stuff now (pointers!), done in #setup_app_data. */
ob->id.recalc |= ID_RECALC_ALL; ob->id.recalc |= ID_RECALC_ALL;
/* new generic xray option */ /* New generic X-ray option. */
arm = blo_do_versions_newlibadr(fd, lib, ob->data); arm = blo_do_versions_newlibadr(fd, lib, ob->data);
enum { ARM_DRAWXRAY = (1 << 1) }; enum { ARM_DRAWXRAY = (1 << 1) };
if (arm->flag & ARM_DRAWXRAY) { if (arm->flag & ARM_DRAWXRAY) {

2
source/blender/draw/intern/draw_manager_data.cc
View File

@ -1243,7 +1243,7 @@ static void sculpt_draw_cb(DRWSculptCallbackData *scd,
DRWShadingGroup *shgrp = scd->shading_groups[index]; DRWShadingGroup *shgrp = scd->shading_groups[index];
if (geom != nullptr && shgrp != nullptr) { if (geom != nullptr && shgrp != nullptr) {
if (SCULPT_DEBUG_BUFFERS) { if (SCULPT_DEBUG_BUFFERS) {
/* Color each buffers in different colors. Only work in solid/Xray mode. */ /* Color each buffers in different colors. Only work in solid/X-ray mode. */
shgrp = DRW_shgroup_create_sub(shgrp); shgrp = DRW_shgroup_create_sub(shgrp);
DRW_shgroup_uniform_vec3( DRW_shgroup_uniform_vec3(
shgrp, "materialDiffuseColor", SCULPT_DEBUG_COLOR(scd->debug_node_nr++), 1); shgrp, "materialDiffuseColor", SCULPT_DEBUG_COLOR(scd->debug_node_nr++), 1);

2
source/blender/editors/space_graph/graph_select.c
View File

@ -174,7 +174,7 @@ static void get_nearest_fcurve_verts_list(bAnimContext *ac, const int mval[2], L
ANIMFILTER_NODUPLIS | ANIMFILTER_FCURVESONLY); ANIMFILTER_NODUPLIS | ANIMFILTER_FCURVESONLY);
if (U.animation_flag & if (U.animation_flag &
USER_ANIM_ONLY_SHOW_SELECTED_CURVE_KEYS) { /* FIXME: this should really be check for by the USER_ANIM_ONLY_SHOW_SELECTED_CURVE_KEYS) { /* FIXME: this should really be check for by the
filtering code... */ * filtering code. */
filter |= ANIMFILTER_SEL; filter |= ANIMFILTER_SEL;
} }
mapping_flag |= ANIM_get_normalization_flags(ac); mapping_flag |= ANIM_get_normalization_flags(ac);

2
source/blender/editors/space_view3d/view3d_view.c
View File

@ -675,7 +675,7 @@ int view3d_opengl_select_ex(ViewContext *vc,
GPU_depth_test(GPU_DEPTH_LESS_EQUAL); GPU_depth_test(GPU_DEPTH_LESS_EQUAL);
} }
/* If in xray mode, we select the wires in priority. */ /* If in X-ray mode, we select the wires in priority. */
if (XRAY_ACTIVE(v3d) && use_nearest) { if (XRAY_ACTIVE(v3d) && use_nearest) {
/* We need to call "GPU_select_*" API's inside DRW_draw_select_loop /* We need to call "GPU_select_*" API's inside DRW_draw_select_loop
* because the OpenGL context created & destroyed inside this function. */ * because the OpenGL context created & destroyed inside this function. */

6
source/blender/makesdna/DNA_gpencil_legacy_types.h
View File

@ -505,7 +505,7 @@ typedef struct bGPDlayer {
struct Object *parent; struct Object *parent;
/** Inverse matrix (only used if parented). */ /** Inverse matrix (only used if parented). */
float inverse[4][4]; float inverse[4][4];
/** String describing subobject info, MAX_ID_NAME-2. */ /** String describing sub-object info, `MAX_ID_NAME - 2`. */
char parsubstr[64]; char parsubstr[64];
short partype; short partype;
@ -574,7 +574,7 @@ typedef enum eGPDlayer_Flag {
GP_LAYER_SELECT = (1 << 5), GP_LAYER_SELECT = (1 << 5),
/* current frame for layer can't be changed */ /* current frame for layer can't be changed */
GP_LAYER_FRAMELOCK = (1 << 6), GP_LAYER_FRAMELOCK = (1 << 6),
/* don't render xray (which is default) */ /* Don't render X-ray (which is default). */
GP_LAYER_NO_XRAY = (1 << 7), GP_LAYER_NO_XRAY = (1 << 7),
/* "volumetric" strokes */ /* "volumetric" strokes */
GP_LAYER_VOLUMETRIC = (1 << 10), GP_LAYER_VOLUMETRIC = (1 << 10),
@ -852,7 +852,7 @@ typedef enum eGP_OnionModes {
GP_ONION_MODE_SELECTED = 2, GP_ONION_MODE_SELECTED = 2,
} eGP_OnionModes; } eGP_OnionModes;
/* xray modes (Depth Ordering) */ /* X-ray modes (Depth Ordering). */
typedef enum eGP_DepthOrdering { typedef enum eGP_DepthOrdering {
GP_XRAY_FRONT = 0, GP_XRAY_FRONT = 0,
GP_XRAY_3DSPACE = 1, GP_XRAY_3DSPACE = 1,