Revision: 47650
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47650
Author: campbellbarton
Date: 2012-06-09 18:56:12 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
style cleanup: assignment & indentation.
Modified Paths:
--------------
trunk/blender/intern/cycles/app/cycles_test.cpp
trunk/blender/intern/cycles/blender/blender_camera.cpp
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/blender/blender_particles.cpp
trunk/blender/intern/cycles/blender/blender_python.cpp
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/bvh/bvh_node.cpp
trunk/blender/intern/cycles/kernel/kernel_differential.h
trunk/blender/intern/cycles/kernel/kernel_path.h
trunk/blender/intern/cycles/kernel/svm/bsdf.h
trunk/blender/intern/cycles/kernel/svm/svm_gradient.h
trunk/blender/intern/cycles/kernel/svm/svm_magic.h
trunk/blender/intern/cycles/kernel/svm/svm_mix.h
trunk/blender/intern/cycles/kernel/svm/svm_noise.h
trunk/blender/intern/cycles/kernel/svm/svm_texture.h
trunk/blender/intern/cycles/kernel/svm/svm_voronoi.h
trunk/blender/intern/cycles/kernel/svm/svm_wave.h
trunk/blender/intern/cycles/render/attribute.cpp
trunk/blender/intern/cycles/render/buffers.cpp
trunk/blender/intern/cycles/render/camera.cpp
trunk/blender/intern/cycles/render/camera.h
trunk/blender/intern/cycles/render/filter.cpp
trunk/blender/intern/cycles/render/nodes.h
trunk/blender/intern/cycles/util/util_cuda.h
trunk/blender/intern/cycles/util/util_hash.h
trunk/blender/intern/cycles/util/util_md5.cpp
trunk/blender/intern/cycles/util/util_md5.h
trunk/blender/intern/cycles/util/util_opencl.cpp
trunk/blender/intern/cycles/util/util_opencl.h
trunk/blender/intern/cycles/util/util_view.cpp
Modified: trunk/blender/intern/cycles/app/cycles_test.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_test.cpp 2012-06-09 18:45:54 UTC
(rev 47649)
+++ trunk/blender/intern/cycles/app/cycles_test.cpp 2012-06-09 18:56:12 UTC
(rev 47650)
@@ -172,8 +172,8 @@
static void resize(int width, int height)
{
- options.width= width;
- options.height= height;
+ options.width = width;
+ options.height = height;
if(options.session)
options.session->reset(session_buffer_params(),
options.session_params.samples);
@@ -197,8 +197,8 @@
static void options_parse(int argc, const char **argv)
{
- options.width= 0;
- options.height= 0;
+ options.width = 0;
+ options.height = 0;
options.filepath = "";
options.session = NULL;
options.quiet = false;
Modified: trunk/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_camera.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_camera.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -222,14 +222,14 @@
}
if(horizontal_fit) {
- *aspectratio= xratio/yratio;
- xaspect= *aspectratio;
- yaspect= 1.0f;
+ *aspectratio = xratio/yratio;
+ xaspect = *aspectratio;
+ yaspect = 1.0f;
}
else {
- *aspectratio= yratio/xratio;
- xaspect= 1.0f;
- yaspect= *aspectratio;
+ *aspectratio = yratio/xratio;
+ xaspect = 1.0f;
+ yaspect = *aspectratio;
}
/* modify aspect for orthographic scale */
Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -46,7 +46,7 @@
float3 *N = attr_N->data_float3();
for(b_mesh.vertices.begin(v); v != b_mesh.vertices.end(); ++v, ++N)
- *N= get_float3(v->normal());
+ *N = get_float3(v->normal());
/* create faces */
BL::Mesh::tessfaces_iterator f;
@@ -175,7 +175,7 @@
for(b_mesh.tessfaces.begin(f); f != b_mesh.tessfaces.end(); ++f) {
int4 vi = get_int4(f->vertices_raw());
- int n= (vi[3] == 0)? 3: 4;
+ int n = (vi[3] == 0) ? 3: 4;
//int shader = used_shaders[f->material_index()];
if(n == 4)
Modified: trunk/blender/intern/cycles/blender/blender_particles.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_particles.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_particles.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -145,7 +145,7 @@
for(b_ob.particle_systems.begin(b_psys); b_psys !=
b_ob.particle_systems.end(); ++b_psys) {
if (use_particle_system(*b_psys)) {
BL::ParticleSystem::particles_iterator b_pa;
- for(b_psys->particles.begin(b_pa), index=0; b_pa !=
b_psys->particles.end(); ++b_pa, ++index) {
+ for(b_psys->particles.begin(b_pa), index = 0; b_pa !=
b_psys->particles.end(); ++b_pa, ++index) {
if(use_particle(*b_pa)) {
Particle pa;
Modified: trunk/blender/intern/cycles/blender/blender_python.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_python.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_python.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -193,7 +193,8 @@
foreach(DeviceInfo& info, devices) {
if(info.type == type ||
- (info.type == DEVICE_MULTI &&
info.multi_devices[0].type == type)) {
+ (info.type == DEVICE_MULTI &&
info.multi_devices[0].type == type))
+ {
CCLDeviceInfo cinfo = {info.id.c_str(),
info.description.c_str(), i++};
device_list.push_back(cinfo);
}
@@ -214,7 +215,7 @@
void *CCL_python_module_init()
{
- PyObject *mod= PyModule_Create(&ccl::module);
+ PyObject *mod = PyModule_Create(&ccl::module);
#ifdef WITH_OSL
PyModule_AddObject(mod, "with_osl", Py_True);
Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -83,8 +83,8 @@
SessionParams session_params =
BlenderSync::get_session_params(b_userpref, b_scene, background);
/* reset status/progress */
- last_status= "";
- last_progress= -1.0f;
+ last_status = "";
+ last_progress = -1.0f;
/* create scene */
scene = new Scene(scene_params);
@@ -292,7 +292,8 @@
SessionParams session_params =
BlenderSync::get_session_params(b_userpref, b_scene, background);
if(session->params.modified(session_params) ||
- scene->params.modified(scene_params)) {
+ scene->params.modified(scene_params))
+ {
free_session();
create_session();
session->start();
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -784,7 +784,9 @@
if(b_lamp->type() == BL::Lamp::type_POINT ||
b_lamp->type() == BL::Lamp::type_SPOT ||
b_lamp->type() == BL::Lamp::type_AREA)
+ {
strength = 100.0f;
+ }
closure = graph->add(new EmissionNode());
closure->input("Color")->value =
get_float3(b_lamp->color());
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-06-09
18:56:12 UTC (rev 47650)
@@ -105,10 +105,13 @@
BL::BlendData::worlds_iterator b_world;
- for(b_data.worlds.begin(b_world); b_world != b_data.worlds.end();
++b_world)
+ for(b_data.worlds.begin(b_world); b_world != b_data.worlds.end();
++b_world) {
if(world_map == b_world->ptr.data &&
- (b_world->is_updated() || (b_world->node_tree() &&
b_world->node_tree().is_updated())))
+ (b_world->is_updated() || (b_world->node_tree() &&
b_world->node_tree().is_updated())))
+ {
world_recalc = true;
+ }
+ }
bool recalc =
shader_map.has_recalc() ||
Modified: trunk/blender/intern/cycles/bvh/bvh_node.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh_node.cpp 2012-06-09 18:45:54 UTC
(rev 47649)
+++ trunk/blender/intern/cycles/bvh/bvh_node.cpp 2012-06-09 18:56:12 UTC
(rev 47650)
@@ -52,7 +52,7 @@
}
if(!is_leaf())
- for(int i=0;i<num_children();i++)
+ for(int i = 0; i < num_children(); i++)
cnt += get_child(i)->getSubtreeSize(stat);
return cnt;
@@ -60,7 +60,7 @@
void BVHNode::deleteSubtree()
{
- for(int i=0;i<num_children();i++)
+ for(int i = 0; i < num_children(); i++)
if(get_child(i))
get_child(i)->deleteSubtree();
@@ -71,7 +71,7 @@
{
float SAH = probability * p.cost(num_children(), num_triangles());
- for(int i=0;i<num_children();i++) {
+ for(int i = 0; i < num_children(); i++) {
BVHNode *child = get_child(i);
SAH += child->computeSubtreeSAHCost(p, probability *
child->m_bounds.safe_area()/m_bounds.safe_area());
}
Modified: trunk/blender/intern/cycles/kernel/kernel_differential.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_differential.h 2012-06-09
18:45:54 UTC (rev 47649)
+++ trunk/blender/intern/cycles/kernel/kernel_differential.h 2012-06-09
18:56:12 UTC (rev 47650)
@@ -49,9 +49,9 @@
* mainly used for differentials of arbitrary mesh attributes. */
/* find most stable axis to project to 2D */
- float xn= fabsf(Ng.x);
- float yn= fabsf(Ng.y);
- float zn= fabsf(Ng.z);
+ float xn = fabsf(Ng.x);
+ float yn = fabsf(Ng.y);
+ float zn = fabsf(Ng.z);
if(zn < xn || zn < yn) {
if(yn < xn || yn < zn) {
Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h 2012-06-09 18:45:54 UTC
(rev 47649)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h 2012-06-09 18:56:12 UTC
(rev 47650)
@@ -137,9 +137,12 @@
(state->diffuse_bounce >=
kernel_data.integrator.max_diffuse_bounce) ||
(state->glossy_bounce >=
kernel_data.integrator.max_glossy_bounce) ||
(state->transmission_bounce >=
kernel_data.integrator.max_transmission_bounce))
+ {
return 0.0f;
- else if(state->bounce <= kernel_data.integrator.min_bounce)
+ }
+ else if(state->bounce <= kernel_data.integrator.min_bounce) {
return 1.0f;
+ }
}
/* probalistic termination */
Modified: trunk/blender/intern/cycles/kernel/svm/bsdf.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/bsdf.h 2012-06-09 18:45:54 UTC
(rev 47649)
+++ trunk/blender/intern/cycles/kernel/svm/bsdf.h 2012-06-09 18:56:12 UTC
(rev 47650)
@@ -47,7 +47,7 @@
float cos = dot(N, I), neta;
float3 Nn;
// compute reflection
- *R =(2 * cos)* N - I;
+ *R = (2 * cos)* N - I;
#ifdef __RAY_DIFFERENTIALS__
*dRdx = (2 * dot(N, dIdx)) * N - dIdx;
*dRdy = (2 * dot(N, dIdy)) * N - dIdy;
@@ -65,18 +65,18 @@
Nn = -N;
*is_inside = true;
}
- *R =(2 * cos)* Nn - I;
+ *R = (2 * cos)* Nn - I;
float arg = 1 -(neta * neta *(1 -(cos * cos)));
if(arg < 0) {
- *T= make_float3(0.0f, 0.0f, 0.0f);
+ *T = make_float3(0.0f, 0.0f, 0.0f);
#ifdef __RAY_DIFFERENTIALS__
- *dTdx= make_float3(0.0f, 0.0f, 0.0f);
- *dTdy= make_float3(0.0f, 0.0f, 0.0f);
+ *dTdx = make_float3(0.0f, 0.0f, 0.0f);
+ *dTdy = make_float3(0.0f, 0.0f, 0.0f);
#endif
return 1; // total internal reflection
} else {
float dnp = sqrtf(arg);
- float nK =(neta * cos)- dnp;
+ float nK = (neta * cos)- dnp;
*T = -(neta * I)+(nK * Nn);
#ifdef __RAY_DIFFERENTIALS__
*dTdx = -(neta * dIdx) + ((neta - neta * neta * cos / dnp) *
dot(dIdx, Nn)) * Nn;
@@ -85,8 +85,8 @@
// compute Fresnel terms
float cosTheta1 = cos; // N.R
float cosTheta2 = -dot(Nn, *T);
- float pPara =(cosTheta1 - eta * cosTheta2)/(cosTheta1 + eta *
cosTheta2);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
