kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix typo in struct name obejct to object.

Browse Source 
Reviewers: sergey

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D3041
This commit is contained in:
Nathan Letwory 2018-02-05 11:01:00 +02:00
parent f911fb0744
commit f9fcda533b
No known key found for this signature in database
GPG Key ID: FDCBA66288B669FF
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/render/object.cpp
View 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;

8
intern/cycles/render/object.h
View 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);
};