diff options
Diffstat (limited to 'intern')
26 files changed, 33 insertions, 35 deletions
diff --git a/intern/clog/clog.c b/intern/clog/clog.c index 416ea25ee0c..13f656d67ab 100644 --- a/intern/clog/clog.c +++ b/intern/clog/clog.c @@ -79,15 +79,15 @@ typedef struct CLG_IDFilter { } CLG_IDFilter; typedef struct CLogContext { - /** Single linked list of types. */ + /** Single linked list of types. */ CLG_LogType *types; - /** Single linked list of references. */ + /** Single linked list of references. */ CLG_LogRef *refs; #ifdef WITH_CLOG_PTHREADS pthread_mutex_t types_lock; #endif - /* exclude, include filters. */ + /* exclude, include filters. */ CLG_IDFilter *filters[2]; bool use_color; bool use_basename; diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 07d5d672dce..62f543941a9 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -181,7 +181,7 @@ static void rtc_filter_occluded_func(const RTCFilterFunctionNArguments *args) /* record intersection */ ctx->local_isect->hits[hit_idx] = current_isect; ctx->local_isect->Ng[hit_idx] = normalize(make_float3(hit->Ng_x, hit->Ng_y, hit->Ng_z)); - /* This tells Embree to continue tracing .*/ + /* This tells Embree to continue tracing. */ *args->valid = 0; break; } diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h index 1a50742dc33..2dc10f30363 100644 --- a/intern/cycles/bvh/bvh_params.h +++ b/intern/cycles/bvh/bvh_params.h @@ -297,7 +297,7 @@ struct BVHSpatialBin { */ struct BVHSpatialStorage { - /* Accumulated bounds when sweeping from right to left. */ + /* Accumulated bounds when sweeping from right to left. */ vector<BoundBox> right_bounds; /* Bins used for histogram when selecting best split plane. */ diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index a9298a9126c..3f7cf47b692 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -65,7 +65,7 @@ class DenoiseParams { /* Viewport start sample. */ int start_sample; - /** Native Denoiser **/ + /** Native Denoiser. */ /* Pixel radius for neighboring pixels to take into account. */ int radius; @@ -81,7 +81,7 @@ class DenoiseParams { /* Clamp the input to the range of +-1e8. Should be enough for any legitimate data. */ bool clamp_input; - /** OIDN/Optix Denoiser **/ + /** OIDN/Optix Denoiser. */ /* Passes handed over to the OIDN/OptiX denoiser (default to color + albedo). */ DenoiserInput input_passes; diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index 3a3f38539c5..acf29cf1baf 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -116,7 +116,7 @@ CCL_NAMESPACE_BEGIN # endif # endif /* __SHADOW_RECORD_ALL__ */ -/* Record all intersections - Volume BVH traversal */ +/* Record all intersections - Volume BVH traversal. */ # if defined(__VOLUME_RECORD_ALL__) # define BVH_FUNCTION_NAME bvh_intersect_volume_all diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h b/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h index 0d50172a907..9814a7cf5c9 100644 --- a/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h +++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h @@ -61,8 +61,8 @@ ccl_device_forceinline float3 bsdf_ashikhmin_shirley_eval_reflect(const ShaderCl const MicrofacetBsdf *bsdf = (const MicrofacetBsdf *)sc; float3 N = bsdf->N; - float NdotI = dot(N, I); /* in Cycles/OSL convention I is omega_out */ - float NdotO = dot(N, omega_in); /* and consequently we use for O omaga_in ;) */ + float NdotI = dot(N, I); /* in Cycles/OSL convention I is omega_out */ + float NdotO = dot(N, omega_in); /* and consequently we use for O omaga_in ;) */ float out = 0.0f; diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h index e8e5d8c5b34..ebc5abc017a 100644 --- a/intern/cycles/kernel/geom/geom_triangle.h +++ b/intern/cycles/kernel/geom/geom_triangle.h @@ -22,7 +22,7 @@ CCL_NAMESPACE_BEGIN -/* normal on triangle */ +/* Normal on triangle. */ ccl_device_inline float3 triangle_normal(KernelGlobals *kg, ShaderData *sd) { /* load triangle vertices */ @@ -40,7 +40,7 @@ ccl_device_inline float3 triangle_normal(KernelGlobals *kg, ShaderData *sd) } } -/* point and normal on triangle */ +/* Point and normal on triangle. */ ccl_device_inline void triangle_point_normal( KernelGlobals *kg, int object, int prim, float u, float v, float3 *P, float3 *Ng, int *shader) { diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index c186e8560eb..70aed6d54ed 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -64,7 +64,7 @@ typedef struct KernelGlobals { OSLThreadData *osl_tdata; # endif - /* **** Run-time data **** */ + /* **** Run-time data **** */ /* Heap-allocated storage for transparent shadows intersections. */ Intersection *transparent_shadow_intersections; diff --git a/intern/cycles/kernel/kernel_projection.h b/intern/cycles/kernel/kernel_projection.h index 387af54cf27..c33d7150b5c 100644 --- a/intern/cycles/kernel/kernel_projection.h +++ b/intern/cycles/kernel/kernel_projection.h @@ -35,7 +35,7 @@ CCL_NAMESPACE_BEGIN -/* Spherical coordinates <-> Cartesian direction */ +/* Spherical coordinates <-> Cartesian direction. */ ccl_device float2 direction_to_spherical(float3 dir) { diff --git a/intern/cycles/kernel/kernel_queues.h b/intern/cycles/kernel/kernel_queues.h index 451d2a0cedf..d8cc08b3e85 100644 --- a/intern/cycles/kernel/kernel_queues.h +++ b/intern/cycles/kernel/kernel_queues.h @@ -79,7 +79,7 @@ ccl_device void enqueue_ray_index_local( { int lidx = ccl_local_id(1) * ccl_local_size(0) + ccl_local_id(0); - /* Get local queue id .*/ + /* Get local queue id. */ unsigned int lqidx; if (enqueue_flag) { lqidx = atomic_fetch_and_inc_uint32(local_queue_atomics); diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 74fa2826cd4..86b3b3b3365 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -302,7 +302,7 @@ enum PathRayFlag { PATH_RAY_DIFFUSE_ANCESTOR = (1 << 15), /* Single pass has been written. */ PATH_RAY_SINGLE_PASS_DONE = (1 << 16), - /* Ray is behind a shadow catcher .*/ + /* Ray is behind a shadow catcher. */ PATH_RAY_SHADOW_CATCHER = (1 << 17), /* Store shadow data for shadow catcher or denoising. */ PATH_RAY_STORE_SHADOW_INFO = (1 << 18), diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index d8b29e3bc1c..891b9172dd4 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -317,4 +317,4 @@ class OSLRenderServices : public OSL::RendererServices { CCL_NAMESPACE_END -#endif /* __OSL_SERVICES_H__ */ +#endif /* __OSL_SERVICES_H__ */ diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index f6bf860631e..bbe8d72edf0 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -803,7 +803,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, float melanin_redness = stack_load_float_default( stack, melanin_redness_ofs, data_node2.w); - /* Randomize melanin. */ + /* Randomize melanin. */ float random_color = stack_load_float_default(stack, random_color_ofs, data_node3.z); random_color = clamp(random_color, 0.0f, 1.0f); float factor_random_color = 1.0f + 2.0f * (random - 0.5f) * random_color; diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp index dcb456dc1ce..6713531c9b0 100644 --- a/intern/cycles/render/alembic.cpp +++ b/intern/cycles/render/alembic.cpp @@ -333,7 +333,7 @@ static M44d get_interpolated_matrix_for_time(const MatrixSampleMap &samples, chr chrono_t t = (time - prev_time) / (next_time - prev_time); - /* ensure rotation around the shortest angle */ + /* Ensure rotation around the shortest angle. */ if ((prev_rotation ^ next_rotation) < 0) { next_rotation = -next_rotation; } diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index f6aa98d867a..dfeec54d915 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -195,4 +195,4 @@ class OSLCompiler { CCL_NAMESPACE_END -#endif /* __OSL_H__ */ +#endif /* __OSL_H__ */ diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 7830ca2293a..ca90af77f6e 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -1252,7 +1252,7 @@ bool Session::update_progressive_refine(bool cancel) double current_time = time_dt(); if (current_time - last_update_time < params.progressive_update_timeout) { - /* if last sample was processed, we need to write buffers anyway */ + /* If last sample was processed, we need to write buffers anyway. */ if (!write && sample != 1) return false; } diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h index 40c2c431aca..7b67b90e44d 100644 --- a/intern/cycles/util/util_color.h +++ b/intern/cycles/util/util_color.h @@ -224,7 +224,7 @@ ccl_device_inline ssef fastpow24(const ssef &arg) ssef arg2 = arg * arg; ssef arg4 = arg2 * arg2; - /* error max = 0.018 avg = 0.0031 |avg| = 0.0031 */ + /* error max = 0.018 avg = 0.0031 |avg| = 0.0031 */ x = improve_5throot_solution(x, arg4); /* error max = 0.00021 avg = 1.6e-05 |avg| = 1.6e-05 */ x = improve_5throot_solution(x, arg4); diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h index 6ac4beb55b8..f7e53f90f74 100644 --- a/intern/cycles/util/util_debug.h +++ b/intern/cycles/util/util_debug.h @@ -129,7 +129,7 @@ class DebugFlags { DEVICE_NONE, /* All OpenCL devices will be used. */ DEVICE_ALL, - /* Default system OpenCL device will be used. */ + /* Default system OpenCL device will be used. */ DEVICE_DEFAULT, /* Host processor will be used. */ DEVICE_CPU, diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index 906bf420756..55344ff86ba 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -88,7 +88,7 @@ class TaskScheduler { /* Approximate number of threads that will work on task, which may be lower * or higher than the actual number of threads. Use as little as possible and - * leave splitting up tasks to the scheduler.. */ + * leave splitting up tasks to the scheduler. */ static int num_threads(); protected: diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cpp index ecf824aafb7..da8b1fd4941 100644 --- a/intern/ghost/intern/GHOST_ContextGLX.cpp +++ b/intern/ghost/intern/GHOST_ContextGLX.cpp @@ -124,7 +124,7 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext() GHOST_X11_ERROR_HANDLERS_OVERRIDE(handler_store); /* -------------------------------------------------------------------- */ - /* Begin Inline Glew */ + /* Begin Inline Glew */ #ifdef USE_GLXEW_INIT_WORKAROUND const GLubyte *extStart = (GLubyte *)""; diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index 954c3efb22c..d899bb1c3c7 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -161,5 +161,5 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::setCurrentDisplaySetting( // CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues); - return /*err == CGDisplayNoErr ?*/ GHOST_kSuccess /*: GHOST_kFailure*/; + return /* err == CGDisplayNoErr ? */ GHOST_kSuccess /* : GHOST_kFailure */; } diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 34b44fde48a..ee312e2fc40 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -589,9 +589,7 @@ static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) } } -/* This function borrowed from Qt's X11 support - * qclipboard_x11.cpp - * */ +/* This function borrowed from Qt's X11 support qclipboard_x11.cpp */ struct init_timestamp_data { Time timestamp; }; @@ -2675,8 +2673,8 @@ void GHOST_SystemX11::refreshXInputDevices() xtablet.PressureLevels = xvi->axes[2].max_value; if (xvi->num_axes > 3) { - /* this is assuming that the tablet has the same tilt resolution in both - * positive and negative directions. It would be rather weird if it didn't.. */ + /* This is assuming that the tablet has the same tilt resolution in both + * positive and negative directions. It would be rather weird if it didn't. */ xtablet.XtiltLevels = xvi->axes[3].max_value; xtablet.YtiltLevels = xvi->axes[4].max_value; } diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 89cb68010fb..713b1fac788 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -78,7 +78,7 @@ extern short (*MEM_testN)(void *vmemh); /** * Duplicates a block of memory, and returns a pointer to the - * newly allocated block. */ + * newly allocated block. */ extern void *(*MEM_dupallocN)(const void *vmemh) /* ATTR_MALLOC */ ATTR_WARN_UNUSED_RESULT; /** diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c index f7a9a785f5a..f19ca4c4368 100644 --- a/intern/guardedalloc/test/simpletest/memtest.c +++ b/intern/guardedalloc/test/simpletest/memtest.c @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) /* ----------------------------------------------------------------- */ /* Round two, do a normal allocation, and corrupt some blocks. */ /* ----------------------------------------------------------------- */ - /* switch off, because it will complain about some things. */ + /* Switch off, because it will complain about some things. */ MEM_set_error_callback(NULL); for (i = 0; i < NUM_BLOCKS; i++) { diff --git a/intern/libmv/libmv/image/array_nd.h b/intern/libmv/libmv/image/array_nd.h index 1a3c39d0461..8ece99a8376 100644 --- a/intern/libmv/libmv/image/array_nd.h +++ b/intern/libmv/libmv/image/array_nd.h @@ -378,7 +378,7 @@ void PrintArray(const Array3Df& array); * (if automatic_range_detection = true) * \note and TODO this automatic detection only works when the image contains * at least one pixel of both bounds. - **/ + */ void FloatArrayToScaledByteArray(const Array3Df& float_array, Array3Du* byte_array, bool automatic_range_detection = false); diff --git a/intern/opencolorio/gpu_shader_display_transform.glsl b/intern/opencolorio/gpu_shader_display_transform.glsl index ca0d2566ed1..d94ff9230e8 100644 --- a/intern/opencolorio/gpu_shader_display_transform.glsl +++ b/intern/opencolorio/gpu_shader_display_transform.glsl @@ -195,7 +195,7 @@ vec4 OCIO_ProcessColor(vec4 col, vec4 col_overlay, vec2 noise_uv) return col; } -/* ------------------------------------------------------------------------ */ +/* ------------------------------------------------------------------------ */ in vec2 texCoord_interp; out vec4 fragColor; |