Revision: 42688
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42688
Author: psy-fi
Date: 2011-12-17 13:23:04 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
merge with trunk 42687
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.h
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/avi.c
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/codecs.c
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/endian.c
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/mjpeg.c
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/options.c
branches/soc-2011-onion-uv-tools/source/blender/avi/intern/rgb32.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/boids.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/camera.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mball.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/suggestions.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/edgehash.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/rand.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/TransformReader.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/TransformWriter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/collada_utils.cpp
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/meshtools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_constraint.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_hook.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_generics.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-onion-uv-tools/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-onion-uv-tools/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/bmp.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/jp2.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/util.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_shader.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/envmap.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_texture.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/strand.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/volumetric.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/zbuf.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_gamma.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_normal.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_gamma.c
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42667
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42687
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
2011-12-17 13:02:31 UTC (rev 42687)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
2011-12-17 13:23:04 UTC (rev 42688)
@@ -368,6 +368,9 @@
xml_read_enum(&wood->type, WaveTextureNode::type_enum,
node, "type");
snode = wood;
}
+ else if(string_iequals(node.name(), "normal")) {
+ snode = new NormalNode();
+ }
else if(string_iequals(node.name(), "mapping")) {
snode = new MappingNode();
}
@@ -443,6 +446,9 @@
xml_read_enum(&mix->type, MixNode::type_enum, node,
"type");
snode = mix;
}
+ else if(string_iequals(node.name(), "gamma")) {
+ snode = new GammaNode();
+ }
else if(string_iequals(node.name(), "combine_rgb")) {
snode = new CombineRGBNode();
}
Modified:
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
2011-12-17 13:02:31 UTC (rev 42687)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
2011-12-17 13:23:04 UTC (rev 42688)
@@ -132,7 +132,6 @@
case BL::ShaderNode::type_GEOMETRY: break;
case BL::ShaderNode::type_MATERIAL: break;
case BL::ShaderNode::type_MATERIAL_EXT: break;
- case BL::ShaderNode::type_NORMAL: break;
case BL::ShaderNode::type_OUTPUT: break;
case BL::ShaderNode::type_SCRIPT: break;
case BL::ShaderNode::type_SQUEEZE: break;
@@ -161,6 +160,10 @@
node = new InvertNode();
break;
}
+ case BL::ShaderNode::type_GAMMA: {
+ node = new GammaNode();
+ break;
+ }
case BL::ShaderNode::type_MIX_RGB: {
BL::ShaderNodeMixRGB b_mix_node(b_node);
MixNode *mix = new MixNode();
@@ -198,6 +201,17 @@
node = vmath;
break;
}
+ case BL::ShaderNode::type_NORMAL: {
+ BL::Node::outputs_iterator out_it;
+ b_node.outputs.begin(out_it);
+ BL::NodeSocketVectorNone vec_sock(*out_it);
+
+ NormalNode *norm = new NormalNode();
+ norm->direction = get_float3(vec_sock.default_value());
+
+ node = norm;
+ break;
+ }
case BL::ShaderNode::type_MAPPING: {
BL::ShaderNodeMapping b_mapping_node(b_node);
MappingNode *mapping = new MappingNode();
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
2011-12-17 13:02:31 UTC (rev 42687)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
2011-12-17 13:23:04 UTC (rev 42688)
@@ -59,6 +59,7 @@
svm/svm_convert.h
svm/svm_displace.h
svm/svm_fresnel.h
+ svm/svm_gamma.h
svm/svm_geometry.h
svm/svm_gradient.h
svm/svm_hsv.h
@@ -72,6 +73,7 @@
svm/svm_musgrave.h
svm/svm_noise.h
svm/svm_noisetex.h
+ svm/svm_normal.h
svm/svm_sepcomb_rgb.h
svm/svm_sky.h
svm/svm_tex_coord.h
Modified:
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
---
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2011-12-17 13:02:31 UTC (rev 42687)
+++
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2011-12-17 13:23:04 UTC (rev 42688)
@@ -19,6 +19,7 @@
node_emission.osl
node_environment_texture.osl
node_fresnel.osl
+ node_gamma.osl
node_geometry.osl
node_glass_bsdf.osl
node_glossy_bsdf.osl
@@ -33,6 +34,7 @@
node_mix.osl
node_mix_closure.osl
node_musgrave_texture.osl
+ node_normal.osl
node_blend_weight_texture.osl
node_noise_texture.osl
node_output_displacement.osl
Copied:
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_gamma.osl
(from rev 42687, trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl)
===================================================================
---
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_gamma.osl
(rev 0)
+++
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_gamma.osl
2011-12-17 13:23:04 UTC (rev 42688)
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "stdosl.h"
+
+shader node_gamma(
+ color ColorIn = color(0.8, 0.8, 0.8),
+ float Gamma = 1.0,
+ output ColorOut = color(0.8, 0.8, 0.8)
+{
+ int i;
+ for (i=0;i<3;i++) {
+ if (ColorIn[i] > 0.0)
+ ColorIn[i] = powf(ColorIn[i], Gamma);
+ }
+
+ ColorOut = ColorIn;
+}
Copied:
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_normal.osl
(from rev 42687, trunk/blender/intern/cycles/kernel/osl/nodes/node_normal.osl)
===================================================================
---
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_normal.osl
(rev 0)
+++
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_normal.osl
2011-12-17 13:23:04 UTC (rev 42688)
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "stdosl.h"
+
+shader node_normal(
+ normal Direction = normal(0.0, 0.0, 0.0),
+ normal NormalIn = normal(0.0, 0.0, 0.0),
+ output normal NormalOut = normal(0.0, 0.0, 0.0),
+ output float Dot = 1.0
+{
+ Direction = normalize(Direction);
+ NormalOut = Direction;
+ Dot = dot(Direction, NormalIn);
+}
+
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
2011-12-17 13:02:31 UTC (rev 42687)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
2011-12-17 13:23:04 UTC (rev 42688)
@@ -130,10 +130,12 @@
#include "svm_geometry.h"
#include "svm_hsv.h"
#include "svm_image.h"
+#include "svm_gamma.h"
#include "svm_invert.h"
#include "svm_light_path.h"
#include "svm_magic.h"
#include "svm_mapping.h"
+#include "svm_normal.h"
#include "svm_wave.h"
#include "svm_math.h"
#include "svm_mix.h"
@@ -261,6 +263,9 @@
case NODE_INVERT:
svm_node_invert(sd, stack, node.y, node.z,
node.w);
break;
+ case NODE_GAMMA:
+ svm_node_gamma(sd, stack, node.y, node.z,
node.w);
+ break;
case NODE_MIX:
svm_node_mix(kg, sd, stack, node.y, node.z,
node.w, &offset);
break;
@@ -300,6 +305,9 @@
case NODE_VECTOR_MATH:
svm_node_vector_math(kg, sd, stack, node.y,
node.z, node.w, &offset);
break;
+ case NODE_NORMAL:
+ svm_node_normal(kg, sd, stack, node.y, node.z,
node.w, &offset);
+ break;
case NODE_MAPPING:
svm_node_mapping(kg, sd, stack, node.y, node.z,
&offset);
break;
Copied: branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_gamma.h
(from rev 42687, trunk/blender/intern/cycles/kernel/svm/svm_gamma.h)
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_gamma.h
(rev 0)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_gamma.h
2011-12-17 13:23:04 UTC (rev 42688)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+CCL_NAMESPACE_BEGIN
+
+__device void svm_node_gamma(ShaderData *sd, float *stack, uint in_gamma, uint
in_color, uint out_color)
+{
+ float3 color = stack_load_float3(stack, in_color);
+ float gamma = stack_load_float(stack, in_gamma);
+
+ if (color.x > 0.0)
+ color.x = powf(color.x, gamma);
+ if (color.y > 0.0)
+ color.y = powf(color.y, gamma);
+ if (color.z > 0.0)
+ color.z = powf(color.z, gamma);
+
+ if (stack_valid(out_color))
+ stack_store_float3(stack, out_color, color);
+}
+
+CCL_NAMESPACE_END
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
