Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-09-29 00:29:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-09-29 00:29:15 +0300
commit79290f51605e31cff09e4984d4f493d05bfe17e2 (patch)
tree77a9513a2c85012ac805f38c1083c423c36c72f1 /intern
parentefe3a13b55c0295b68697c19e4379b5bbe8684ca (diff)
Cleanup: spelling in comments
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_session.h5
-rw-r--r--intern/cycles/kernel/device/hip/compat.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index fb0e5252e3b..58683ee07a1 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -110,8 +110,7 @@ class BlenderSession {
BL::RenderSettings b_render;
BL::Depsgraph b_depsgraph;
/* NOTE: Blender's scene might become invalid after call
- * free_blender_memory_if_possible().
- */
+ * #free_blender_memory_if_possible(). */
BL::Scene b_scene;
BL::SpaceView3D b_v3d;
BL::RegionView3D b_rv3d;
@@ -147,7 +146,7 @@ class BlenderSession {
protected:
void stamp_view_layer_metadata(Scene *scene, const string &view_layer_name);
- /* Check whether session error happenned.
+ /* Check whether session error happened.
* If so, it is reported to the render engine and true is returned.
* Otherwise false is returned. */
bool check_and_report_session_error();
diff --git a/intern/cycles/kernel/device/hip/compat.h b/intern/cycles/kernel/device/hip/compat.h
index 3644925d5be..95338fe7d6e 100644
--- a/intern/cycles/kernel/device/hip/compat.h
+++ b/intern/cycles/kernel/device/hip/compat.h
@@ -79,7 +79,7 @@ typedef unsigned long long uint64_t;
#define ccl_gpu_global_id_x() (ccl_gpu_block_idx_x * ccl_gpu_block_dim_x + ccl_gpu_thread_idx_x)
#define ccl_gpu_global_size_x() (ccl_gpu_grid_dim_x * ccl_gpu_block_dim_x)
-/* GPU warp synchronizaton */
+/* GPU warp synchronization */
#define ccl_gpu_syncthreads() __syncthreads()
#define ccl_gpu_ballot(predicate) __ballot(predicate)