[Bf-blender-cvs] [f9fcda533bc] master: Fix typo in struct name obejct to object.

Nathan Letwory noreply at git.blender.org
Mon Feb 5 10:32:10 CET 2018


Commit: f9fcda533bc003e7ad0b262be4eaf5767c16073f
Author: Nathan Letwory
Date:   Mon Feb 5 11:01:00 2018 +0200
Branches: master
https://developer.blender.org/rBf9fcda533bc003e7ad0b262be4eaf5767c16073f

Fix typo in struct name obejct to object.

Reviewers: sergey

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D3041

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

M	intern/cycles/render/object.cpp
M	intern/cycles/render/object.h

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

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 4c06654d756..e03160954bc 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -285,7 +285,7 @@ ObjectManager::~ObjectManager()
 {
 }
 
-void ObjectManager::device_update_object_transform(UpdateObejctTransformState *state,
+void ObjectManager::device_update_object_transform(UpdateObjectTransformState *state,
                                                    Object *ob,
                                                    int object_index)
 {
@@ -433,7 +433,7 @@ void ObjectManager::device_update_object_transform(UpdateObejctTransformState *s
 }
 
 bool ObjectManager::device_update_object_transform_pop_work(
-        UpdateObejctTransformState *state,
+        UpdateObjectTransformState *state,
         int *start_index,
         int *num_objects)
 {
@@ -458,7 +458,7 @@ bool ObjectManager::device_update_object_transform_pop_work(
 }
 
 void ObjectManager::device_update_object_transform_task(
-        UpdateObejctTransformState *state)
+        UpdateObjectTransformState *state)
 {
 	int start_index, num_objects;
 	while(device_update_object_transform_pop_work(state,
@@ -478,7 +478,7 @@ void ObjectManager::device_update_transforms(DeviceScene *dscene,
                                              uint *object_flag,
                                              Progress& progress)
 {
-	UpdateObejctTransformState state;
+	UpdateObjectTransformState state;
 	state.need_motion = scene->need_motion();
 	state.have_motion = false;
 	state.have_curves = false;
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h
index 88645bc4a80..acdb1b64123 100644
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -113,7 +113,7 @@ public:
 
 protected:
 	/* Global state of object transform update. */
-	struct UpdateObejctTransformState {
+	struct UpdateObjectTransformState {
 		/* Global state used by device_update_object_transform().
 		 * Common for both threaded and non-threaded update.
 		 */
@@ -152,12 +152,12 @@ protected:
 		/* First unused object index in the queue. */
 		int queue_start_object;
 	};
-	void device_update_object_transform(UpdateObejctTransformState *state,
+	void device_update_object_transform(UpdateObjectTransformState *state,
 	                                    Object *ob,
 	                                    const int object_index);
-	void device_update_object_transform_task(UpdateObejctTransformState *state);
+	void device_update_object_transform_task(UpdateObjectTransformState *state);
 	bool device_update_object_transform_pop_work(
-	        UpdateObejctTransformState *state,
+	        UpdateObjectTransformState *state,
 	        int *start_index,
 	        int *num_objects);
 };



More information about the Bf-blender-cvs mailing list