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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 13:26:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 13:26:12 +0300
commit48997d2e40a74a83fb9edfb9de0999139392f634 (patch)
treebb968328b736dd1f9f5433061d8cfbd10fb6ef9b /intern/cycles/render/object.cpp
parent3f292596769d699c8347be075a6d4bff8fffd556 (diff)
Cycles: Cleanup, style
Diffstat (limited to 'intern/cycles/render/object.cpp')
-rw-r--r--intern/cycles/render/object.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index d8f3ce58505..8b8b988b969 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -253,7 +253,7 @@ vector<float> Object::motion_times()
bool Object::is_traceable()
{
/* Mesh itself can be empty,can skip all such objects. */
- if (!bounds.valid() || bounds.size() == make_float3(0.0f, 0.0f, 0.0f)) {
+ if(!bounds.valid() || bounds.size() == make_float3(0.0f, 0.0f, 0.0f)) {
return false;
}
/* TODO(sergey): Check for mesh vertices/curves. visibility flags. */
@@ -624,8 +624,9 @@ void ObjectManager::device_update_flags(Device *device,
void ObjectManager::device_update_patch_map_offsets(Device *device, DeviceScene *dscene, Scene *scene)
{
- if (scene->objects.size() == 0)
+ if(scene->objects.size() == 0) {
return;
+ }
uint4* objects = (uint4*)dscene->objects.get_data();