[Bf-blender-cvs] [ea9d94c] master: Spelling

Campbell Barton noreply at git.blender.org
Tue Aug 5 21:47:12 CEST 2014


Commit: ea9d94cf280bec54f6917789d56768a64646e0f7
Author: Campbell Barton
Date:   Wed Aug 6 05:39:41 2014 +1000
Branches: master
https://developer.blender.org/rBea9d94cf280bec54f6917789d56768a64646e0f7

Spelling

===================================================================

M	build_files/cmake/buildinfo.cmake
M	intern/ghost/CMakeLists.txt
M	intern/ghost/intern/GHOST_System.h
M	intern/ghost/test/gears/GHOST_Test.cpp
M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/compositor/COM_compositor.h

===================================================================

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index 3660b3e..16564b3 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -2,12 +2,12 @@
 # ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
 
 # Extract working copy information for SOURCE_DIR into MY_XXX variables
-# with a default in case anything fails, for examble when using git-svn
+# with a default in case anything fails, for example when using git-svn
 set(MY_WC_HASH "unknown")
 set(MY_WC_BRANCH "unknown")
 set(MY_WC_COMMIT_TIMESTAMP 0)
 
-# Guess if this is a SVN working copy and then look up the revision
+# Guess if this is a git working copy and then look up the revision
 if(EXISTS ${SOURCE_DIR}/.git)
 	# The FindGit.cmake module is part of the standard distribution
 	include(FindGit)
@@ -110,7 +110,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
 		if(NOT _git_changed_files STREQUAL "")
 			set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
 		else()
-			# Unpushed commits are also considered local odifications
+			# Unpushed commits are also considered local modifications
 			execute_process(COMMAND git log @{u}..
 			                WORKING_DIRECTORY ${SOURCE_DIR}
 			                OUTPUT_VARIABLE _git_unpushed_log
@@ -127,7 +127,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
 endif()
 
 # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
-# but BUILD_DATE and BUILD_TIME are plataform dependant
+# but BUILD_DATE and BUILD_TIME are platform dependent
 if(UNIX)
 	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 	execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index beca24f..cfa2f54 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -129,7 +129,7 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 	endif()
 
 
-	# ack, this is still system dependant
+	# ack, this is still system dependent
 	if(APPLE)
 		list(APPEND SRC
 			intern/GHOST_SystemPathsCocoa.mm
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 57aa0a3..ec0022f 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -333,7 +333,7 @@ protected:
 	virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window **window, const GHOST_DisplaySetting &settings,
 	                                              const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0);
 
-	/** The display manager (platform dependant). */
+	/** The display manager (platform dependent). */
 	GHOST_DisplayManager *m_displayManager;
 
 	/** The timer manager. */
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index 78e5257..a81aaa8 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -262,7 +262,8 @@ static void View(GHOST_IWindow *window, bool stereo, int eye = 0)
 	window->activateDrawingContext();
 	GHOST_Rect bnds;
 	int noOfScanlines = 0, lowerScanline = 0;
-	int verticalBlankingInterval = 32;  // hard coded for testing purposes, display device dependant
+	/* hard coded for testing purposes, display device dependent */
+	int verticalBlankingInterval = 32;
 	float left, right, bottom, top;
 	float nearplane, farplane, zeroPlane, distance;
 	float eyeSeparation = 0.62f;
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 4633636..5ee82bb 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2403,7 +2403,7 @@ static void animsys_evaluate_overrides(PointerRNA *ptr, AnimData *adt)
 
 /* Overview of how this system works:
  *	1) Depsgraph sorts data as necessary, so that data is in an order that means 
- *		that all dependencies are resolved before dependants.
+ *		that all dependencies are resolved before dependents.
  *	2) All normal animation is evaluated, so that drivers have some basis values to
  *		work with
  *		a.	NLA stacks are done first, as the Active Actions act as 'tweaking' tracks
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h
index 2cf2c69..9b22444 100644
--- a/source/blender/compositor/COM_compositor.h
+++ b/source/blender/compositor/COM_compositor.h
@@ -208,7 +208,7 @@ extern "C" {
  *
  * @see ExecutionGroup.execute Execute a complete ExecutionGroup. Halts until finished or breaked by user
  * @see ExecutionGroup.scheduleChunkWhenPossible Tries to schedule a single chunk,
- * checks if all input data is available. Can trigger dependant chunks to be calculated
+ * checks if all input data is available. Can trigger dependent chunks to be calculated
  * @see ExecutionGroup.scheduleAreaWhenPossible Tries to schedule an area. This can be multiple chunks
  * (is called from [@ref ExecutionGroup.scheduleChunkWhenPossible])
  * @see ExecutionGroup.scheduleChunk Schedule a chunk on the WorkScheduler




More information about the Bf-blender-cvs mailing list