Commit: 3afff59ca5cada00e3924fbbebfa01f3224c4786 Author: Joseph Eagar Date: Thu Jun 2 17:30:21 2022 -0700 Branches: sculpt-dev https://developer.blender.org/rB3afff59ca5cada00e3924fbbebfa01f3224c4786
sculpt-dev: Preemptively apply 'e' enum prefix change before merge =================================================================== M intern/ghost/GHOST_Types.h M intern/ghost/intern/GHOST_ContextWGL.cpp M release/datafiles/locale M release/scripts/addons M release/scripts/addons_contrib M source/blender/blenkernel/BKE_attribute.h M source/blender/blenkernel/BKE_attribute_access.hh M source/blender/blenkernel/BKE_attribute_math.hh M source/blender/blenkernel/BKE_curves.hh M source/blender/blenkernel/BKE_customdata.h M source/blender/blenkernel/BKE_geometry_fields.hh M source/blender/blenkernel/BKE_geometry_set.hh M source/blender/blenkernel/BKE_mesh.h M source/blender/blenkernel/BKE_mesh_mapping.h M source/blender/blenkernel/BKE_mesh_mirror.h M source/blender/blenkernel/BKE_mesh_runtime.h M source/blender/blenkernel/BKE_mesh_sample.hh M source/blender/blenkernel/BKE_paint.h M source/blender/blenkernel/BKE_pbvh.h M source/blender/blenkernel/intern/attribute.c M source/blender/blenkernel/intern/attribute_access.cc M source/blender/blenkernel/intern/attribute_access_intern.hh M source/blender/blenkernel/intern/bassrelief.cc M source/blender/blenkernel/intern/brush_channel_names.hh M source/blender/blenkernel/intern/curve_to_mesh_convert.cc M source/blender/blenkernel/intern/curves_geometry.cc M source/blender/blenkernel/intern/customdata.cc M source/blender/blenkernel/intern/geometry_component_curve.cc M source/blender/blenkernel/intern/geometry_component_curves.cc M source/blender/blenkernel/intern/geometry_component_instances.cc M source/blender/blenkernel/intern/geometry_component_mesh.cc M source/blender/blenkernel/intern/geometry_component_pointcloud.cc M source/blender/blenkernel/intern/geometry_set.cc M source/blender/blenkernel/intern/mesh_fair.cc M source/blender/blenkernel/intern/mesh_merge_customdata.cc M source/blender/blenkernel/intern/mesh_remesh_voxel.cc M source/blender/blenkernel/intern/mesh_sample.cc M source/blender/blenkernel/intern/mesh_validate.cc M source/blender/blenkernel/intern/multires_reshape_smooth.c M source/blender/blenkernel/intern/paint.c M source/blender/blenkernel/intern/pbvh.c M source/blender/blenkernel/intern/pbvh.cc M source/blender/blenkernel/intern/pbvh_bmesh.c M source/blender/blenkernel/intern/pbvh_intern.h M source/blender/blenkernel/intern/scene.cc M source/blender/blenlib/BLI_assert.h M source/blender/blenloader/intern/versioning_290.c M source/blender/bmesh/intern/bmesh_construct.c M source/blender/bmesh/intern/bmesh_data_attr.cc M source/blender/bmesh/intern/bmesh_data_attr.h M source/blender/bmesh/intern/bmesh_interp.c M source/blender/bmesh/intern/bmesh_mesh.h M source/blender/bmesh/intern/bmesh_mesh_convert.cc M source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c M source/blender/bmesh/operators/bmo_join_triangles.c M source/blender/depsgraph/intern/builder/deg_builder_cycle.cc M source/blender/draw/engines/overlay/overlay_lattice.c M source/blender/draw/intern/draw_attributes.cc M source/blender/draw/intern/draw_attributes.h M source/blender/draw/intern/draw_cache_impl_curves.cc M source/blender/draw/intern/draw_cache_impl_mesh.c M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc M source/blender/draw/intern/shaders/common_subdiv_ibo_lines_comp.glsl M source/blender/draw/intern/shaders/common_subdiv_ibo_tris_comp.glsl M source/blender/draw/intern/shaders/common_subdiv_patch_evaluation_comp.glsl M source/blender/editors/geometry/geometry_attributes.cc M source/blender/editors/interface/interface_template_attribute_search.cc M source/blender/editors/mesh/editmesh_undo.c M source/blender/editors/mesh/editmesh_utils.c M source/blender/editors/mesh/mesh_data.cc M source/blender/editors/mesh/mesh_ops.c M source/blender/editors/object/object_data_transfer.c M source/blender/editors/object/object_modes.c M source/blender/editors/object/object_relations.c M source/blender/editors/sculpt_paint/paint_cursor.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sculpt_paint/paint_mask.c M source/blender/editors/sculpt_paint/paint_vertex.cc M source/blender/editors/sculpt_paint/sculpt.c M source/blender/editors/sculpt_paint/sculpt_array.c M source/blender/editors/sculpt_paint/sculpt_cloth.c M source/blender/editors/sculpt_paint/sculpt_intern.h M source/blender/editors/sculpt_paint/sculpt_paint_color.c M source/blender/editors/sculpt_paint/sculpt_replay.c M source/blender/editors/sculpt_paint/sculpt_undo.c M source/blender/editors/space_file/fsmenu.c M source/blender/editors/space_node/node_draw.cc M source/blender/editors/space_node/node_geometry_attribute_search.cc M source/blender/editors/space_node/node_relationships.cc M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.hh M source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc M source/blender/editors/space_spreadsheet/spreadsheet_ops.cc M source/blender/geometry/intern/realize_instances.cc M source/blender/geometry/intern/resample_curves.cc M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c M source/blender/gpu/GPU_buffers.h M source/blender/gpu/GPU_material.h M source/blender/gpu/intern/gpu_buffers.c M source/blender/gpu/intern/gpu_node_graph.c M source/blender/gpu/opengl/gl_shader.cc M source/blender/io/alembic/intern/abc_customdata.cc M source/blender/io/alembic/intern/abc_reader_mesh.cc M source/blender/io/usd/intern/usd_reader_mesh.cc M source/blender/makesdna/DNA_customdata_types.h M source/blender/makesdna/DNA_meshdata_types.h M source/blender/makesdna/DNA_modifier_types.h M source/blender/makesdna/DNA_node_types.h M source/blender/makesdna/DNA_space_types.h M source/blender/makesrna/RNA_access.h M source/blender/makesrna/intern/rna_attribute.c M source/blender/makesrna/intern/rna_modifier.c M source/blender/modifiers/intern/MOD_bevel.c M source/blender/modifiers/intern/MOD_nodes.cc M source/blender/modifiers/intern/MOD_triangulate.c M source/blender/modifiers/intern/MOD_wireframe.c M source/blender/nodes/NOD_geometry_exec.hh M source/blender/nodes/NOD_geometry_nodes_eval_log.hh M source/blender/nodes/function/nodes/node_fn_random_value.cc M source/blender/nodes/geometry/node_geometry_util.cc M source/blender/nodes/geometry/node_geometry_util.hh M source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc M source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc M source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc M source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc M source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc M source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc M source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc M source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc M source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc M source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc M source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc M source/blender/nodes/geometry/nodes/node_geo_field_at_index.cc M source/blender/nodes/geometry/nodes/node_geo_input_curve_handles.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc M source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc M source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc M source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc M source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc M source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc M source/blender/nodes/geometry/nodes/node_geo_material_selection.cc M source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc M source/blender/nodes/geometry/nodes/node_geo_points_to_vertices.cc M source/blender/nodes/geometry/nodes/node_geo_raycast.cc M source/blender/nodes/geometry/nodes/node_geo_remove_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc M source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc M source/blender/nodes/geometry/nodes/node_geo_set_id.cc M source/blender/nodes/geometry/nodes/node_geo_set_position.cc M source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc M source/blender/nodes/geometry/nodes/node_geo_viewer.cc M source/blender/nodes/intern/geometry_nodes_eval_log.cc M source/blender/nodes/intern/node_geometry_exec.cc M source/blender/nodes/shader/nodes/node_shader_map_range.cc M source/blender/nodes/shader/nodes/node_shader_uvmap.cc M source/blender/nodes/shader/nodes/node_shader_vertex_color.cc M source/blender/windowmanager/intern/wm_files.c M source/blender/windowmanager/intern/wm_keymap_utils.c M source/tools =================================================================== diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index fe7ec0ff840..1a638447385 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -10,15 +10,15 @@ #include <stdint.h> #ifndef ATTR_NO_OPT -#ifdef __clang__ -# define ATTR_NO_OPT __attribute__((optnone)) -#elif defined(_MSC_VER) -# define ATTR_NO_OPT __pragma(optimize("", off)) -#elif defined(__GNUC__) -# define ATTR_NO_OPT __attribute__((optimize("O0"))) -#else -# define ATTR_NO_OPT -#endif +# ifdef __clang__ +# define ATTR_NO_OPT __attribute__((optnone)) +# elif defined(_MSC_VER) +# define ATTR_NO_OPT __pragma(optimize("", off)) +# elif defined(__GNUC__) +# define ATTR_NO_OPT __attribute__((optimize("O0"))) +# else +# define ATTR_NO_OPT +# endif #endif #ifdef WITH_CXX_GUARDEDALLOC diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp index 109f1af5c40..bfb22740189 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.cpp +++ b/intern/ghost/intern/GHOST_ContextWGL.cpp @@ -15,7 +15,6 @@ #include <cstdio> #include <vector> - HGLRC GHOST_ContextWGL::s_sharedHGLRC = NULL; int GHOST_ContextWGL::s_sharedCount = 0; diff --git a/release/datafiles/locale b/release/datafiles/locale index fb1eac2ec80..71e0f87dd1b 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit fb1eac2ec80c0adee69990a5386b74a5bd4ca00c +Subproject commit 71e0f87dd1ba4e0ed5f619b031045a428e534230 diff --git a/release/scripts/addons b/release/scripts/addons index 7025cd28ede..bcb71eea69a 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 7025cd28ede25eb44208722f842e35b10325c6cc +Subproject commit bcb71eea69a7b83c44112a5872ccd67cae96ec6f diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 61e45814503..61efd17f87b 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 61e45814503f51963c91c51aaf764612e7c5dc72 +Subproject commit 61efd17f87b45c3049091127a5619219f9d2a821 diff --git a/source/blender/blenkernel/BKE_attribute.h b/source/blender/blenkernel/BKE_attribute.h index 2084524ba25..4e559323c7b 100644 --- a/source/blender/blenkernel/BKE_attribute.h +++ b/source/blender/blenkernel/BKE_attribute.h @@ -22,7 +22,7 @@ struct ID; struct ReportList; /** #Attribute.domain */ -typedef enum AttributeDomain { +typedef enum eAttrDomain { ATTR_DOMAIN_AUTO = -1, /* Use for nodes to choose automatically based on other data. */ ATTR_DOMAIN_POINT = 0, /* Mesh, Curve or Point Cloud Point */ ATTR_DOMAIN_EDGE = 1, /* Mesh Edge */ @@ -32,7 +32,7 @@ typedef enum AttributeDomain { ATTR_DOMAIN_INSTANCE = 5, /* Instance */ ATTR_DOMAIN_NUM -} AttributeDomain; +} eAttrDomain; typedef enum AttributeDomainMask { ATTR_DOMAIN_MASK_POINT = (1 << 0), @@ -54,7 +54,7 @@ bool BKE_id_attributes_supported(struct ID *id); /** Create a new attribute layer. */ struct CustomDataLayer *BKE_id_attribute_new( - struct ID *id, const char *name, int type, AttributeDomain domain, struct ReportList *reports); + struct ID *id, const char *name, int type, eAttrDomain domain, struct ReportList *reports); bool BKE_id_attribute_remove(struct ID *id, struct CustomDataLayer *layer, struct ReportList *reports); @@ -62,9 +62,9 @@ bool BKE_id_attribute_remove(struct ID *id, struct CustomDataLayer *BKE_id_attribute_find(const struct ID *id, const char *name, int type, - AttributeDomain domain); + eAttrDomain domain); -AttributeDomain BKE_id_attribute_domain(const struct ID *id, const struct CustomDataLayer *layer); +eAttrDomain BKE_id_attribute_domain(const struct ID *id, const struct CustomDataLayer *layer); int BKE_id_attribute_data_length(struct ID *id, struct CustomDataLayer *layer); bool BKE_id_attribute_required(struct ID *id, struct CustomDataLayer *layer); bool BKE_id_attribute_rename(struct ID *id, @@ -74,7 +74,7 @@ bool BKE_id_attribute_rename(struct ID *id, int BKE_id_attributes_length(const struct ID *id, AttributeDomainMask domain_mask, - CustomDataMask mask, + eCustomDataMask mask, bool skip_temporary); struct CustomDataLayer *BKE_id_attributes_active_get(struct ID *id); @@ -85,23 +85,23 @@ CustomData *BKE_id_attributes_iterator_next_domain(struct ID *id, struct CustomD CustomDataLayer *BKE_id_attribute_from_index(struct ID *id, int lookup_index, AttributeDomainMask domain_mask, - CustomDataMask layer_mask); + eCustomDataMask layer_mask); /** Layer is allowed to be nullptr; if so -1 (layer not found) will be returned. */ int BKE_id_attribute_to_index(const struct ID *id, const CustomDataLayer *layer, AttributeDomainMask domain_mask, - CustomDataMask layer_mask); + eCustomDataMask layer_mask); struct CustomDataLayer *BKE_id_attribute_subset_active_get(const struct ID *id, int active_flag, AttributeDomainMask domain_mask, - CustomDataMask mask); + eCustomDataMask mask); void BKE_id_attribute_subset_active_set(struct ID *id, struct CustomDataLayer *layer, int active_flag, AttributeDomainMask domain_mask, - CustomDataMask mask); + eCustomDataMask mask); /** * Sets up a temporary ID with arbitrary CustomData domains. r_id will diff --git a/source/blender/blenkernel/BKE_attribute_access.hh b/source/blender/blenkernel/BKE_attribute_access.hh index 8d449a124ec..2b4bc6c5425 100644 --- a/source/blender/blenkernel/BKE_attribute_access.hh +++ b/source/blender/blenkernel/BKE_attribute_access.hh @@ -32,7 +32,7 @@ * extremely important for writing coherent bug-free code. When an attribute is retrieved with * write access, via #WriteAttributeLookup or #OutputAttribute, the geometry component must be * tagged to clear caches that depend on the changed data. - * 2. Domain interpolation: When retrieving an attribute, a domain (#AttributeDomain) can be + * 2. Domain interpolation: When retrieving an attribute, a domain (#eAttrDomain) can be * provided. If the attribute is stored on a different domain and conversion is possible, a * version of the data interpolated to the requested domain will be provided. These conversions * are implemented in each #GeometryComponent by `attribute_try_adapt_domain_impl`. @@ -85,8 +85,8 @@ class AttributeIDRef { * stored (uv map, vertex group, ...). */ struct AttributeMetaData { - AttributeDomain domain; - CustomDataType data_type; + eAttrDomain domain; + eCustomDataType data_type; constexpr friend bool operator==(AttributeMetaData a, AttributeMetaData b) { @@ -95,8 +95,8 @@ struct AttributeMetaData { }; struct AttributeKind { - AttributeDomain domain; - CustomDataType data_type; + eAttrDomain domain; + eCustomDataType data_type; }; /** @@ -164,12 +164,12 @@ using AttributeForeachCallback = blender::FunctionRef<bool( namespace blender::bke { -CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType> data_types); +eCustomDataType attribute_data_type_highest_complexity(Span<eCustomDataType> data_types); /** * Domains with a higher "information density" have a higher priority, * in order to choose a domain that will not lose data through domain conversion. */ -AttributeDomain attribute_domain_highest_priority(Span<AttributeDomain> domains); +eAttrDomain attribute_domain_highest_priority(Span<eAttrDomain> domains); /** * Used when looking up a "plain attribute" based on a name for reading from it. @@ -178,7 +178,7 @@ struct ReadAttributeLookup { /* The virtual array that is used to read from this attribute. */ GVArray varray; /* Domain the attribute lives on in the geometry. */ - AttributeDomain domain; + eAttrDomain domain; /* Convenience function to check if the attribute has been found. */ operator bool() const @@ -194,7 +194,7 @@ struct WriteAttributeLookup { /** The virtual array that is used to read from and write to the attribute. */ GVMutableArray varray; /** Domain the attributes lives on in the geometry component. */ - AttributeDomain domain; + eAttrDomain domain; /** * Call this after changing the attribute to invalidate caches that depend on this attribute. * \note Do not call this after the component the attribute is from has been destructed. @@ -229,7 +229,7 @@ class OutputAttribute { private: GVMutableArray varray_; - AttributeDomain domain_ = ATTR_DOMAIN_AUTO; + eAttrDomain domain_ = ATTR_DOMAIN_AUTO; SaveFn save_; std::unique_ptr<GVMutableArray_GSpan> optional_span_varray_; bool ignore_old_values_ = false; @@ -238,10 +238,7 @@ class OutputAttribute { public: OutputAttribute(); OutputAttribute(OutputAttribute &&other); - OutputAttribute(GVMutableArray varray, - AttributeDomain domain, - SaveFn save, - bool ignore_old_values); + OutputAttribute(GVMutableArray varray, eAttrDomain domain, SaveFn save, bool ignore_old_values); ~OutputAttribute(); @@ -250,9 +247,9 @@ class OutputAttribute { GVMutableArray &operator*(); GVMutableArray *operator->(); GVMutableArray &varray(); - AttributeDomain doma @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs