Revision: 56947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56947
Author: nazgul
Date: 2013-05-21 16:27:26 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Merging r56933 through r56946 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56933
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56946
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_gradient_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_gradient.h
branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/addon.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_args.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_translations.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/creator/creator.c
Removed Paths:
-------------
branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_westin.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56932
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56946
Modified: branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf.h
2013-05-21 14:44:50 UTC (rev 56946)
+++ branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf.h
2013-05-21 16:27:26 UTC (rev 56947)
@@ -96,14 +96,14 @@
label = bsdf_ashikhmin_velvet_sample(sc, sd->Ng, sd->I,
sd->dI.dx, sd->dI.dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
- /*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+ case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
label = bsdf_westin_backscatter_sample(sc, sd->Ng,
sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
label = bsdf_westin_sheen_sample(sc, sd->Ng, sd->I,
sd->dI.dx, sd->dI.dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
- break;*/
+ break;
#endif
default:
label = LABEL_NONE;
@@ -165,12 +165,12 @@
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
eval = bsdf_ashikhmin_velvet_eval_reflect(sc,
sd->I, omega_in, pdf);
break;
- /*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+ case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
eval = bsdf_westin_backscatter_eval_reflect(sc,
sd->I, omega_in, pdf);
break;
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
eval = bsdf_westin_sheen_eval_reflect(sc,
sd->I, omega_in, pdf);
- break;*/
+ break;
#endif
default:
eval = make_float3(0.0f, 0.0f, 0.0f);
@@ -214,12 +214,12 @@
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
eval = bsdf_ashikhmin_velvet_eval_transmit(sc,
sd->I, omega_in, pdf);
break;
- /*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+ case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
eval =
bsdf_westin_backscatter_eval_transmit(sc, sd->I, omega_in, pdf);
break;
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
eval = bsdf_westin_sheen_eval_transmit(sc,
sd->I, omega_in, pdf);
- break;*/
+ break;
#endif
default:
eval = make_float3(0.0f, 0.0f, 0.0f);
@@ -281,12 +281,12 @@
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
bsdf_ashikhmin_velvet_blur(sc, roughness);
break;
- /*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+ case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
bsdf_westin_backscatter_blur(sc, roughness);
break;
case CLOSURE_BSDF_WESTIN_SHEEN_ID:
bsdf_westin_sheen_blur(sc, roughness);
- break;*/
+ break;
#endif
default:
break;
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
2013-05-21 14:44:50 UTC (rev 56946)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
2013-05-21 16:27:26 UTC (rev 56947)
@@ -125,7 +125,7 @@
{
float z = 1.0f - 2.0f*u1;
float r = sqrtf(fmaxf(0.0f, 1.0f - z*z));
- float phi = 2.0f*M_PI_F*u2;
+ float phi = M_2PI_F*u2;
float x = r*cosf(phi);
float y = r*sinf(phi);
Modified: branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
2013-05-21 14:44:50 UTC (rev 56946)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
2013-05-21 16:27:26 UTC (rev 56947)
@@ -17,7 +17,6 @@
bsdf_diffuse_ramp.cpp
bsdf_phong_ramp.cpp
bsdf_toon.cpp
- bsdf_westin.cpp
emissive.cpp
osl_bssrdf.cpp
osl_closures.cpp
Deleted: branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_westin.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_westin.cpp
2013-05-21 14:44:50 UTC (rev 56946)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_westin.cpp
2013-05-21 16:27:26 UTC (rev 56947)
@@ -1,177 +0,0 @@
-/*
- * Adapted from Open Shading Language with this license:
- *
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
- * All Rights Reserved.
- *
- * Modifications Copyright 2011, Blender Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Sony Pictures Imageworks nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <OpenImageIO/fmath.h>
-
-#include <OSL/genclosure.h>
-
-#include "osl_closures.h"
-
-#include "kernel_types.h"
-#include "kernel_montecarlo.h"
-#include "closure/bsdf_westin.h"
-
-CCL_NAMESPACE_BEGIN
-
-using namespace OSL;
-
-/* WESTIN BACKSCATTER */
-
-class WestinBackscatterClosure : public CBSDFClosure {
-public:
- WestinBackscatterClosure() : CBSDFClosure(LABEL_GLOSSY) {}
-
- size_t memsize() const { return sizeof(*this); }
- const char *name() const { return "westin_backscatter"; }
-
- void setup()
- {
- sc.prim = this;
- m_shaderdata_flag = bsdf_westin_backscatter_setup(&sc);
- }
-
- bool mergeable(const ClosurePrimitive *other) const
- {
- return false;
- }
-
- void blur(float roughness)
- {
- bsdf_westin_backscatter_blur(&sc, roughness);
- }
-
- void print_on(std::ostream &out) const
- {
- out << name() << " ((" << sc.N[0] << ", " << sc.N[1] << ", " <<
sc.N[2] << "))";
- }
-
- float3 eval_reflect(const float3 &omega_out, const float3 &omega_in,
float& pdf) const
- {
- return bsdf_westin_backscatter_eval_reflect(&sc, omega_out,
omega_in, &pdf);
- }
-
- float3 eval_transmit(const float3 &omega_out, const float3 &omega_in,
float& pdf) const
- {
- return bsdf_westin_backscatter_eval_transmit(&sc, omega_out,
omega_in, &pdf);
- }
-
- int sample(const float3 &Ng,
- const float3 &omega_out, const float3 &domega_out_dx, const
float3 &domega_out_dy,
- float randu, float randv,
- float3 &omega_in, float3 &domega_in_dx, float3 &domega_in_dy,
- float &pdf, float3 &eval) const
- {
- return bsdf_westin_backscatter_sample(&sc, Ng, omega_out,
domega_out_dx, domega_out_dy,
- randu, randv, &eval, &omega_in, &domega_in_dx,
&domega_in_dy, &pdf);
- }
-};
-
-ClosureParam *closure_westin_backscatter_params()
-{
- static ClosureParam params[] = {
- CLOSURE_FLOAT3_PARAM(WestinBackscatterClosure, sc.N),
- CLOSURE_FLOAT_PARAM(WestinBackscatterClosure, sc.data0),
- CLOSURE_STRING_KEYPARAM("label"),
- CLOSURE_FINISH_PARAM(WestinBackscatterClosure)
- };
- return params;
-}
-
-CLOSURE_PREPARE(closure_westin_backscatter_prepare, WestinBackscatterClosure)
-
-/* WESTIN SHEEN */
-
-class WestinSheenClosure : public CBSDFClosure {
-public:
- WestinSheenClosure() : CBSDFClosure(LABEL_DIFFUSE) {}
-
- size_t memsize() const { return sizeof(*this); }
- const char *name() const { return "westin_sheen"; }
-
- void setup()
- {
- sc.prim = this;
- m_shaderdata_flag = bsdf_westin_sheen_setup(&sc);
- }
-
- bool mergeable(const ClosurePrimitive *other) const
- {
- return false;
- }
-
- void blur(float roughness)
- {
- bsdf_westin_sheen_blur(&sc, roughness);
- }
-
- void print_on(std::ostream &out) const
- {
- out << name() << " ((" << sc.N[0] << ", " << sc.N[1] << ", " <<
sc.N[2] << "))";
- }
-
- float3 eval_reflect(const float3 &omega_out, const float3 &omega_in,
float& pdf) const
- {
- return bsdf_westin_sheen_eval_reflect(&sc, omega_out, omega_in,
&pdf);
- }
-
- float3 eval_transmit(const float3 &omega_out, const float3 &omega_in,
float& pdf) const
- {
- return bsdf_westin_sheen_eval_transmit(&sc, omega_out,
omega_in, &pdf);
- }
-
- int sample(const float3 &Ng,
- const float3 &omega_out, const float3 &domega_out_dx, const
float3 &domega_out_dy,
- float randu, float randv,
- float3 &omega_in, float3 &domega_in_dx, float3 &domega_in_dy,
- float &pdf, float3 &eval) const
- {
- return bsdf_westin_sheen_sample(&sc, Ng, omega_out,
domega_out_dx, domega_out_dy,
- randu, randv, &eval, &omega_in, &domega_in_dx,
&domega_in_dy, &pdf);
- }
-};
-
-ClosureParam *closure_westin_sheen_params()
-{
- static ClosureParam params[] = {
- CLOSURE_FLOAT3_PARAM(WestinSheenClosure, sc.N),
- CLOSURE_FLOAT_PARAM(WestinSheenClosure, sc.data0),
- CLOSURE_STRING_KEYPARAM("label"),
- CLOSURE_FINISH_PARAM(WestinSheenClosure)
- };
- return params;
-}
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
