Commit: e2354e64d2cd8b11bb3ace22a6ba353d7a1382d8
Author: Sergey Sharybin
Date: Tue Apr 7 00:25:54 2015 +0500
Branches: master
https://developer.blender.org/rBe2354e64d2cd8b11bb3ace22a6ba353d7a1382d8
Cycles: Cleanup, spaces around assignment operator
Did some bad spacing in recent commits, better to get rid of those so
they does not confuse those who're working on sources.
===================================================================
M intern/cycles/blender/blender_curves.cpp
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
M intern/cycles/kernel/geom/geom_bvh_shadow.h
M intern/cycles/kernel/geom/geom_motion_triangle.h
M intern/cycles/kernel/geom/geom_qbvh_shadow.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/osl/osl_services.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_curves.cpp
b/intern/cycles/blender/blender_curves.cpp
index 91963ac..dba801f 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -621,7 +621,7 @@ void ExportCurveSegments(Scene *scene, Mesh *mesh,
ParticleCurveData *CData)
}
/* check allocation */
- if((mesh->curve_keys.size() != num_keys) || (mesh->curves.size() !=
num_curves)) {
+ if((mesh->curve_keys.size() != num_keys) || (mesh->curves.size() !=
num_curves)) {
VLOG(1) << "Allocation failed, clearing data";
mesh->curve_keys.clear();
mesh->curves.clear();
diff --git a/intern/cycles/blender/blender_mesh.cpp
b/intern/cycles/blender/blender_mesh.cpp
index ce2d270..deae36f 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -324,15 +324,15 @@ static void attr_create_uv_map(Scene *scene,
size_t i = 0;
for(l->data.begin(t); t != l->data.end(); ++t,
++i) {
- fdata[0] = get_float3(t->uv1());
- fdata[1] = get_float3(t->uv2());
- fdata[2] = get_float3(t->uv3());
+ fdata[0] = get_float3(t->uv1());
+ fdata[1] = get_float3(t->uv2());
+ fdata[2] = get_float3(t->uv3());
fdata += 3;
if(nverts[i] == 4) {
- fdata[0] =
get_float3(t->uv1());
- fdata[1] =
get_float3(t->uv3());
- fdata[2] =
get_float3(t->uv4());
+ fdata[0] = get_float3(t->uv1());
+ fdata[1] = get_float3(t->uv3());
+ fdata[2] = get_float3(t->uv4());
fdata += 3;
}
}
diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
index 580f50d..0b6ce3c 100644
--- a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
+++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
@@ -114,7 +114,7 @@ ccl_device int bsdf_ashikhmin_velvet_sample(const
ShaderClosure *sc, float3 Ng,
float sinNH2 = 1 - cosNH * cosNH;
float sinNH4 = sinNH2 * sinNH2;
- float cotangent2 = (cosNH * cosNH) / sinNH2;
+ float cotangent2 = (cosNH * cosNH) / sinNH2;
float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2
* M_1_PI_F / sinNH4;
float G = min(1.0f, min(fac1, fac2)); // TODO: derive G
from D analytically
diff --git a/intern/cycles/kernel/geom/geom_bvh_shadow.h
b/intern/cycles/kernel/geom/geom_bvh_shadow.h
index 030283e..d2609fc 100644
--- a/intern/cycles/kernel/geom/geom_bvh_shadow.h
+++ b/intern/cycles/kernel/geom/geom_bvh_shadow.h
@@ -264,7 +264,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals
*kg,
if(kernel_tex_fetch(__prim_type, isect_array->prim) & PRIMITIVE_ALL_TRIANGLE)
#endif
{
- shader =
kernel_tex_fetch(__tri_shader, prim);
+ shader =
kernel_tex_fetch(__tri_shader, prim);
}
#ifdef __HAIR__
else {
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h
b/intern/cycles/kernel/geom/geom_motion_triangle.h
index d3297e0..a5a25f4 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle.h
+++ b/intern/cycles/kernel/geom/geom_motion_triangle.h
@@ -236,7 +236,7 @@ ccl_device_inline float3
motion_triangle_refine_subsurface(KernelGlobals *kg, Sh
ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals *kg,
ShaderData *sd, const Intersection *isect, const Ray *ray, bool subsurface)
{
/* get shader */
- sd->shader = kernel_tex_fetch(__tri_shader, sd->prim);
+ sd->shader = kernel_tex_fetch(__tri_shader, sd->prim);
/* get motion info */
int numsteps, numverts;
diff --git a/intern/cycles/kernel/geom/geom_qbvh_shadow.h
b/intern/cycles/kernel/geom/geom_qbvh_shadow.h
index f9fda39..2adebb2 100644
--- a/intern/cycles/kernel/geom/geom_qbvh_shadow.h
+++ b/intern/cycles/kernel/geom/geom_qbvh_shadow.h
@@ -279,7 +279,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals
*kg,
if(kernel_tex_fetch(__prim_type, isect_array->prim) & PRIMITIVE_ALL_TRIANGLE)
#endif
{
- shader =
kernel_tex_fetch(__tri_shader, prim);
+ shader =
kernel_tex_fetch(__tri_shader, prim);
}
#ifdef __HAIR__
else {
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index 71b2f74..e9d9f72 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -87,7 +87,7 @@ ccl_device void shader_setup_from_ray(KernelGlobals *kg,
ShaderData *sd,
if(sd->type & PRIMITIVE_TRIANGLE) {
/* static triangle */
float3 Ng = triangle_normal(kg, sd);
- sd->shader = kernel_tex_fetch(__tri_shader, sd->prim);
+ sd->shader = kernel_tex_fetch(__tri_shader, sd->prim);
/* vectors */
sd->P = triangle_refine(kg, sd, isect, ray);
@@ -166,7 +166,7 @@ ccl_device_inline void
shader_setup_from_subsurface(KernelGlobals *kg, ShaderDat
/* fetch triangle data */
if(sd->type == PRIMITIVE_TRIANGLE) {
float3 Ng = triangle_normal(kg, sd);
- sd->shader = kernel_tex_fetch(__tri_shader, sd->prim);
+ sd->shader = kernel_tex_fetch(__tri_shader, sd->prim);
/* static triangle */
sd->P = triangle_refine_subsurface(kg, sd, isect, ray);
diff --git a/intern/cycles/kernel/osl/osl_services.cpp
b/intern/cycles/kernel/osl/osl_services.cpp
index f865cfb..bc89b7eb 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -956,7 +956,7 @@ bool OSLRenderServices::texture3d(ustring filename,
TextureOpt &options,
else {
OSLThreadData *tdata = kg->osl_tdata;
OIIO::TextureSystem::Perthread *thread_info =
tdata->oiio_thread_info;
- OIIO::TextureSystem::TextureHandle *th =
ts->get_texture_handle(filename, thread_info);
+ OIIO::TextureSystem::TextureHandle *th =
ts->get_texture_handle(filename, thread_info);
#if OIIO_VERSION < 10500
status = ts->texture3d(th, thread_info,
options, P, dPdx, dPdy, dPdz, result);
@@ -993,7 +993,7 @@ bool OSLRenderServices::environment(ustring filename,
TextureOpt &options,
OSLThreadData *tdata = kg->osl_tdata;
OIIO::TextureSystem::Perthread *thread_info = tdata->oiio_thread_info;
- OIIO::TextureSystem::TextureHandle *th =
ts->get_texture_handle(filename, thread_info);
+ OIIO::TextureSystem::TextureHandle *th =
ts->get_texture_handle(filename, thread_info);
#if OIIO_VERSION < 10500
bool status = ts->environment(th, thread_info,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
