[Bf-blender-cvs] [dab7885807f] soc-2021-curves: Merge branch 'master' into soc-2021-curves
Dilith Jayakody
noreply at git.blender.org
Wed Jul 21 04:42:37 CEST 2021
Commit: dab7885807fe1ea300f3a9cdb6efc6a41c54e2b2
Author: Dilith Jayakody
Date: Wed Jul 21 01:01:25 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBdab7885807fe1ea300f3a9cdb6efc6a41c54e2b2
Merge branch 'master' into soc-2021-curves
===================================================================
M extern/rangetree/intern/generic_alloc_impl.h
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_ContextEGL.cpp
M intern/ghost/intern/GHOST_ContextWGL.cpp
M intern/ghost/intern/GHOST_DisplayManager.cpp
M intern/ghost/intern/GHOST_DropTargetX11.cpp
M intern/ghost/intern/GHOST_EventDragnDrop.h
M intern/ghost/intern/GHOST_EventManager.cpp
M intern/ghost/intern/GHOST_NDOFManager.cpp
M intern/ghost/intern/GHOST_NDOFManager.h
M intern/ghost/intern/GHOST_Rect.cpp
M intern/ghost/intern/GHOST_System.cpp
M intern/ghost/intern/GHOST_SystemSDL.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/ghost/intern/GHOST_TimerManager.cpp
M intern/ghost/intern/GHOST_WindowManager.cpp
M intern/ghost/intern/GHOST_WindowWayland.cpp
M intern/rigidbody/RBI_api.h
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/modules/rna_manual_reference.py
M release/scripts/startup/bl_operators/assets.py
M release/scripts/startup/bl_operators/geometry_nodes.py
M release/scripts/startup/bl_operators/rigidbody.py
M release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_material.py
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_DerivedMesh.h
A source/blender/blenkernel/BKE_action.hh
A source/blender/blenkernel/BKE_armature.hh
M source/blender/blenkernel/BKE_cloth.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_mesh_types.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/CMakeLists.txt
A source/blender/blenkernel/intern/action_bones.cc
M source/blender/blenkernel/intern/armature_pose.cc
A source/blender/blenkernel/intern/armature_selection.cc
M source/blender/blenkernel/intern/armature_test.cc
M source/blender/blenkernel/intern/boids.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/gpencil_geom.cc
M source/blender/blenkernel/intern/image_save.c
M source/blender/blenkernel/intern/main_idmap.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/mesh_mapping.c
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/spline_base.cc
M source/blender/blenlib/BLI_array.h
M source/blender/blenlib/BLI_color.hh
M source/blender/blenlib/BLI_compiler_typecheck.h
M source/blender/blenlib/BLI_delaunay_2d.h
M source/blender/blenlib/BLI_dlrbTree.h
M source/blender/blenlib/BLI_ghash.h
M source/blender/blenlib/BLI_link_utils.h
M source/blender/blenlib/BLI_linklist_stack.h
M source/blender/blenlib/BLI_math.h
M source/blender/blenlib/intern/BLI_dynstr.c
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/BLI_ghash_utils.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/BLI_memiter.c
M source/blender/blenlib/intern/BLI_mempool.c
M source/blender/blenlib/intern/BLI_mmap.c
M source/blender/blenlib/intern/DLRB_tree.c
M source/blender/blenlib/intern/array_store.c
M source/blender/blenlib/intern/convexhull_2d.c
M source/blender/blenlib/intern/delaunay_2d.cc
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/blenlib/intern/math_color_inline.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_geom_inline.c
M source/blender/blenlib/intern/math_vector_inline.c
M source/blender/blenlib/intern/memory_utils.c
M source/blender/blenlib/intern/mesh_boolean.cc
M source/blender/blenlib/intern/mesh_intersect.cc
M source/blender/blenlib/intern/noise.c
M source/blender/blenlib/intern/polyfill_2d.c
M source/blender/blenlib/intern/smallhash.c
M source/blender/blenlib/intern/string.c
M source/blender/blenlib/intern/timecode.c
M source/blender/blenlib/intern/winstuff.c
M source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/bmesh.h
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_structure.c
M source/blender/compositor/CMakeLists.txt
M source/blender/compositor/COM_defines.h
A source/blender/compositor/intern/COM_BufferArea.h
A source/blender/compositor/intern/COM_BufferRange.h
A source/blender/compositor/intern/COM_BuffersIterator.h
M source/blender/compositor/intern/COM_ConstantFolder.cc
M source/blender/compositor/intern/COM_Debug.cc
M source/blender/compositor/intern/COM_Debug.h
M source/blender/compositor/intern/COM_FullFrameExecutionModel.cc
M source/blender/compositor/intern/COM_MemoryBuffer.cc
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/operations/COM_BrightnessOperation.cc
M source/blender/compositor/operations/COM_BrightnessOperation.h
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
M source/blender/compositor/operations/COM_EllipseMaskOperation.cc
M source/blender/compositor/operations/COM_EllipseMaskOperation.h
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
M source/blender/compositor/operations/COM_MixOperation.cc
M source/blender/compositor/operations/COM_MixOperation.h
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/compositor/operations/COM_SunBeamsOperation.cc
M source/blender/compositor/operations/COM_ViewerOperation.cc
M source/blender/compositor/operations/COM_ViewerOperation.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_rna.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/node/deg_node_operation.cc
M source/blender/depsgraph/intern/node/deg_node_operation.h
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/animation/CMakeLists.txt
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/anim_motion_paths.c
M source/blender/editors/animation/keyframes_draw.c
A source/blender/editors/animation/keyframes_keylist.c
M source/blender/editors/armature/CMakeLists.txt
R066 source/blender/editors/armature/pose_backup.c source/blender/editors/armature/pose_backup.cc
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/asset/CMakeLists.txt
M source/blender/editors/asset/asset_list.cc
A source/blender/editors/asset/intern/asset_library_reference.cc
A source/blender/editors/asset/intern/asset_library_reference.hh
M source/blender/editors/include/ED_keyframes_draw.h
A source/blender/editors/include/ED_keyframes_keylist.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_template_list.cc
M source/blender/editors/interface/view2d.c
M source/blender/editors/mask/mask_add.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_view3d/view3d_camera_control.c
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/editors/transform/transform_convert_mesh.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/imbuf/intern/oiio/openimageio_api.cpp
M source/blender/io/collada/BCAnimationSampler.cpp
M source/blender/io/collada/TransformReader.cpp
M source/blender/io/collada/collada_utils.cpp
M source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_documentation.h
M source/blender/makesdna/DNA_material_defaults.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc
A source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
M source/blender/nodes/texture/nodes/node_texture_rotate.c
M source/blender/python/generic/py_capi_utils.c
M source/blender/python/gpu/gpu_py.c
M source/blender/python/gpu/gpu_py_api.c
M source/blender/python/gpu/gpu_py_batch.c
M source/blender/python/gpu/gpu_py_buffer.c
M source/blender/python/gpu/gpu_py_capabilities.c
M source/blender/python/gpu/gpu_py_element.c
M source/blender/python/gpu/gpu_py_framebuffer.c
M source/blender/python/gpu/gpu_py_matrix.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/python/gpu/gpu_py_platform.c
M source/blender/python/gpu/gpu_py_select.c
M source/blender/python/gpu/gpu_py_shader.c
M source/blender/python/gpu/gpu_py_state.c
M source/blender/python/gpu/gpu_py_texture.c
M source/blender/python/gpu/gpu_py_types.c
M source/blender/python/gpu/gpu_py_uniformbuffer.c
M source/blender/python/gpu/gpu_py_vertex_buffer.c
M source/blender/python/gpu/gpu_py_vertex_format.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/bpy_utils_units.c
M source/blender/python/mathutils/mathutils.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/python/mathutils/mathutils_geometry.c
M source/blender/render/intern/bake.c
M source/blender/sequencer/intern/strip_transform.c
M source/blender/simulation/intern/SIM_mass_spring.cpp
M source/blender/simulation/intern/hair_volume.cpp
M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_gesture_ops.c
M source/blender/windowmanager/intern/wm_operator_type.c
===================================================================
diff --git a/extern/rangetree/intern/generic_alloc_impl.h b/extern/rangetree/intern/generic_alloc_impl.h
index 0f9f5184637..fd6e85a155a 100644
--- a/extern/rangetree/intern/generic_alloc_impl.h
+++ b/extern/rangetree/intern/generic_alloc_impl.h
@@ -32,7 +32,7 @@
* - #TPOOL_STRUCT: Name for pool struct name.
* - #TPOOL_CHUNK_SIZE: Chunk size (optional), use 64kb when not defined.
*
- * \note #TPOOL_ALLOC_TYPE must be at least ``sizeof(void *)``.
+ * \note #TPOOL_ALLOC_TYPE must be at least `sizeof(void *)`.
*
* Defines the API, uses #TPOOL_IMPL_PREFIX to prefix each function.
*
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index 687173ded09..7af243846c2 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -217,7 +217,7 @@ static void makeAttribList(std::vector<NSOpenGLPixelFormatAttribute> &attribs,
attribs.push_back(NSOpenGLPFAOpenGLProfile);
attribs.push_back(coreProfile ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy);
- // Pixel Format Attributes for the windowed NSOpenGLContext
+ /* Pixel Format Attributes for the windowed NSOpenGLContext. */
attribs.push_back(NSOpenGLPFADoubleBuffer);
if (softwareGL) {
@@ -250,7 +250,8 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
static const bool needAlpha = false;
#endif
- static bool softwareGL = getenv("BLENDER_SOFTWAREGL"); // command-line argument would be better
+ /* Command-line argument would be better. */
+ static bool softwareGL = getenv("BLENDER_SOFTWAREGL");
std::vector<NSOpenGLPixelFormatAttribute> attribs;
attribs.reserve(40);
@@ -287,7 +288,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
if (m_metalView) {
if (m_defaultFramebuffer == 0) {
- // Create a virtual framebuffer
+ /* Create a virtual frame-buffer. */
[m_openGLContext makeCurrentContext];
metalInitFramebuffer();
initClearGL();
@@ -342,11 +343,11 @@ void GHOST_ContextCGL::metalInit()
/* clang-format on */
id<MTLDevice> device = m_metalLayer.device;
- // Create a command queue for blit/present operation
+ /* Create a command queue for blit/present operation. */
m_metalCmdQueue = (MTLCommandQueue *)[device newCommandQueue];
[m_metalCmdQueue retain];
- // Create shaders for blit operation
+ /* Create shaders for blit operation. */
NSString *source = @R"msl(
using namespace metal;
@@ -387,7 +388,7 @@ void GHOST_ContextCGL::metalInit()
"GHOST_ContextCGL::metalInit: newLibraryWithSource:options:error: failed!");
}
- // Create a render pipeline for blit operation
+ /* Create a render pipeline for blit operation. */
MTLRenderPipelineDescriptor *desc = [[[MTLRenderPipelineDescriptor alloc] init] autorelease];
desc.fragmentFunction = [library newFunctionWithName:@"fragment_shader"];
@@ -460,7 +461,7 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
"GHOST_ContextCGL::metalUpdateFramebuffer: CVPixelBufferCreate failed!");
}
- // Create an OpenGL texture
+ /* Create an OpenGL texture. */
CVOpenGLTextureCacheRef cvGLTexCache = nil;
cvret = CVOpenGLTextureCacheCreate(kCFAllocatorDefault,
nil,
@@ -485,7 +486,7 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
unsigned int glTex;
glTex = CVOpenGLTextureGetName(cvGLTex);
- // Create a Metal texture
+ /* Create a Metal texture. */
CVMetalTextureCacheRef cvMetalTexCache = nil;
cvret = CVMetalTextureCacheCreate(
kCFAllocatorDefault, nil, m_metalLayer.device, nil, &cvMetalTexCache);
diff --git a/intern/ghost/intern/GHOST_ContextEGL.cpp b/intern/ghost/intern/GHOST_ContextEGL.cpp
index 0fee200ea1a..a64b2aef6a5 100644
--- a/intern/ghost/intern/GHOST_ContextEGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextEGL.cpp
@@ -283,8 +283,8 @@ GHOST_TSuccess GHOST_ContextEGL::setSwapInterval(int interval)
GHOST_TSuccess GHOST_ContextEGL::getSwapInterval(int &intervalOut)
{
- // This is a bit of a kludge because there does not seem to
- // be a way to query the swap interval with EGL.
+ /* This is a bit of a kludge because there does not seem to
+ * be a way to query the swap interval with EGL. */
intervalOut = m_swap_interval;
return GHOST_kSuccess;
@@ -365,21 +365,21 @@ static const std::string &api_string(EGLenum api)
GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
{
- // objects have to be declared here due to the use of goto
+ /* Objects have to be declared here due to the use of `goto`. */
std::vector<EGLint> attrib_list;
EGLint num_config = 0;
if (m_stereoVisual)
fprintf(stderr, "Warning! Stereo OpenGL ES contexts are not supported.\n");
- m_stereoVisual = false; // It doesn't matter what the Window wants.
+ m_stereoVisual = false; /* It doesn't matter what the Window wants. */
if (!initContextEGLEW()) {
return GHOST_kFailure;
}
#ifdef WITH_GL_ANGLE
- // d3dcompiler_XX.dll needs to be loaded before ANGLE will work
+ /* `d3dcompiler_XX.dll` needs to be loaded before ANGLE will work. */
if (s_d3dcompiler == NULL) {
s_d3dcompiler = LoadLibrary(D3DCOMPILER);
@@ -410,13 +410,13 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
if (!bindAPI(m_api))
goto error;
- // build attribute list
+ /* Build attribute list. */
attrib_list.reserve(20);
if (m_api == EGL_OPENGL_ES_API && EGLEW_VERSION_1_2) {
- // According to the spec it seems that you are required to set EGL_RENDERABLE_TYPE,
- // but some implementations (ANGLE) do not seem to care.
+ /* According to the spec it seems that you are required to set EGL_RENDERABLE_TYPE,
+ * but some implementations (ANGLE) do not seem to care. */
if (m_contextMajorVersion == 1) {
attrib_list.push_back(EGL_RENDERABLE_TYPE);
@@ -469,7 +469,7 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
#endif
if (m_nativeWindow == 0) {
- // off-screen surface
+ /* Off-screen surface. */
attrib_list.push_back(EGL_SURFACE_TYPE);
attrib_list.push_back(EGL_PBUFFER_BIT);
}
@@ -479,8 +479,8 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext()
if (!EGL_CHK(::eglChooseConfig(m_display, &(attrib_list[0]), &m_config, 1, &num_config)))
goto error;
- // A common error is to assume that ChooseConfig worked because it returned EGL_TRUE
- if (num_config != 1) // num_config should be exactly 1
+ /* A common error is to assume that ChooseConfig worked because it returned EGL_TRUE. */
+ if (num_config != 1) /* `num_config` should be exactly 1. */
goto error;
if (m_nativeWindow != 0) {
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index ddb34a8afd9..b5b3fab838d 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -335,10 +335,11 @@ void GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD)
if (!WIN32_CHK(::wglMakeCurrent(dummyHDC, dummyHGLRC)))
goto finalize;
- if (GLEW_CHK(glewInit()) != GLEW_OK)
+ if (GLEW_CHK(glewInit()) != GLEW_OK) {
fprintf(stderr, "Warning! Dummy GLEW/WGLEW failed to initialize properly.\n");
+ }
- // the following are not technially WGLEW, but they also require a context to work
+ /* The following are not technically WGLEW, but they also require a context to work. */
#ifndef NDEBUG
free((void *)m_dummyRenderer);
diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cpp
index fe12a76753d..9abc652378a 100644
--- a/intern/ghost/intern/GHOST_DisplayManager.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManager.cpp
@@ -51,7 +51,7 @@ GHOST_TSuccess GHOST_DisplayManager::initialize(void)
GHOST_TSuccess GHOST_DisplayManager::getNumDisplays(uint8_t & /*numDisplays*/) const
{
- // Don't know if we have a display...
+ /* Don't know if we have a display. */
return GHOST_kFailure;
}
@@ -120,18 +120,18 @@ GHOST_TSuccess GHOST_DisplayManager::findMatch(uint8_t display,
(int)setting.xPixels, (int)setting.yPixels, (int)setting.bpp, (int)setting.frequency};
int capabilities[4];
double field, score;
- double best = 1e12; // A big number
+ double best = 1e12; /* A big number. */
int found = 0;
- // Look at all the display modes
+ /* Look at all the display modes. */
for (int i = 0; (i < (int)m_settings[display].size()); i++) {
- // Store the capabilities of the display device
+ /* Store the capabilities of the display device. */
capabilities[0] = m_settings[display][i].xPixels;
capabilities[1] = m_settings[display][i].yPixels;
capabilities[2] = m_settings[display][i].bpp;
capabilities[3] = m_settings[display][i].frequency;
- // Match against all the fields of the display settings
+ /* Match against all the fields of the display settings. */
score = 0;
for (int j = 0; j < 4; j++) {
field = capabilities[j] - criteria[j];
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.cpp b/intern/ghost/intern/GHOST_DropTargetX11.cpp
index 8758a27930e..dba1d305144 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetX11.cpp
@@ -115,8 +115,10 @@ GHOST_DropTargetX11::~GHOST_DropTargetX11()
/* Based on: https://stackoverflow.com/a/2766963/432509 */
typedef enum DecodeState_e {
- STATE_SEARCH = 0, ///< searching for an ampersand to convert
- STATE_CONVERTING ///< convert the two proceeding characters from hex
+ /** Searching for an ampersand to convert. */
+ STATE_SEARCH = 0,
+ /** Convert the two proceeding characters from hex. */
+ STATE_CONVERTING
} DecodeState_e;
void GHOST_DropTargetX11::UrlDecode(char *decodedOut, int bufferSize, const char *encodedIn)
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.h
index 537717b1717..0095cedb8c8 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.h
@@ -90,7 +90,7 @@ class GHOST_EventDragnDrop : public GHOST_Event {
~GHOST_EventDragn
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list