Fix typo in struct name obejct to object.
authorNathan Letwory <nathan@mcneel.com>
Mon, 5 Feb 2018 09:01:00 +0000 (11:01 +0200)
committerNathan Letwory <nathan@mcneel.com>
Mon, 5 Feb 2018 09:31:33 +0000 (11:31 +0200)
Reviewers: sergey

Reviewed By: sergey

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

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

index 4c06654d756857a898411e3ebd87c3d1b042ecf2..e03160954bcc084d737a64104d89dcffc30375e5 100644 (file)
@@ -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;
index 88645bc4a8061befa13123a782af6466e85ea06c..acdb1b641238441ed4c2b7b03bf81a74129d1282 100644 (file)
@@ -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);
 };