[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60790] trunk/blender: And once more set SVN props and change EOLs

gsr b3d gsr.b3d at infernal-iceberg.com
Wed Oct 16 01:11:42 CEST 2013


Revision: 60790
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60790
Author:   gsrb3d
Date:     2013-10-15 23:11:41 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
And once more set SVN props and change EOLs

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl
    trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl
    trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl
    trunk/blender/intern/cycles/kernel/shaders/node_vector_transform.osl
    trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
    trunk/blender/intern/cycles/kernel/svm/svm_vector_transform.h
    trunk/blender/intern/cycles/render/blackbody.cpp
    trunk/blender/intern/cycles/render/blackbody.h
    trunk/blender/release/scripts/presets/cycles/sampling/final.py
    trunk/blender/release/scripts/presets/cycles/sampling/preview.py
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_blackbody.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectTransform.c

Property Changed:
----------------
    trunk/blender/doc/python_api/examples/bpy.types.UIList.2.py
    trunk/blender/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
    trunk/blender/extern/libmv/libmv-capi_intern.h
    trunk/blender/extern/libmv/third_party/ceres/include/ceres/c_api.h
    trunk/blender/extern/libmv/third_party/ceres/include/ceres/covariance.h
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.h
    trunk/blender/extern/rangetree/CMakeLists.txt
    trunk/blender/extern/wcwidth/CMakeLists.txt
    trunk/blender/intern/atomic/atomic_ops.h
    trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl
    trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl
    trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl
    trunk/blender/intern/cycles/kernel/shaders/node_vector_transform.osl
    trunk/blender/intern/cycles/kernel/svm/svm_blackbody.h
    trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
    trunk/blender/intern/cycles/kernel/svm/svm_vector_transform.h
    trunk/blender/intern/cycles/render/blackbody.cpp
    trunk/blender/intern/cycles/render/blackbody.h
    trunk/blender/intern/cycles/render/sky_model.cpp
    trunk/blender/intern/cycles/render/sky_model.h
    trunk/blender/intern/cycles/render/sky_model_data.h
    trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
    trunk/blender/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
    trunk/blender/intern/ghost/test/multitest/stubs.c
    trunk/blender/intern/guardedalloc/intern/mallocn_intern.h
    trunk/blender/intern/guardedalloc/intern/mallocn_lockfree_impl.c
    trunk/blender/intern/locale/CMakeLists.txt
    trunk/blender/intern/opencolorio/CMakeLists.txt
    trunk/blender/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
    trunk/blender/release/datafiles/LICENSE-droidsans.ttf.txt
    trunk/blender/release/datafiles/blender_icons.svg
    trunk/blender/release/datafiles/prvicons.svg
    trunk/blender/release/scripts/freestyle/data/env_map/brown00.png
    trunk/blender/release/scripts/freestyle/data/env_map/gray00.png
    trunk/blender/release/scripts/freestyle/data/env_map/gray01.png
    trunk/blender/release/scripts/freestyle/data/env_map/gray02.png
    trunk/blender/release/scripts/freestyle/data/env_map/gray03.png
    trunk/blender/release/scripts/freestyle/data/textures/papers/whitepaper.jpg
    trunk/blender/release/scripts/presets/cycles/sampling/final.py
    trunk/blender/release/scripts/presets/cycles/sampling/preview.py
    trunk/blender/release/scripts/startup/bl_operators/mask.py
    trunk/blender/release/text/GPL3-license.txt
    trunk/blender/release/text/jemalloc-license.txt
    trunk/blender/scons/scons-local/SCons/Action.py
    trunk/blender/scons/scons-local/SCons/Builder.py
    trunk/blender/scons/scons-local/SCons/CacheDir.py
    trunk/blender/scons/scons-local/SCons/Conftest.py
    trunk/blender/scons/scons-local/SCons/Debug.py
    trunk/blender/scons/scons-local/SCons/Defaults.py
    trunk/blender/scons/scons-local/SCons/Environment.py
    trunk/blender/scons/scons-local/SCons/Errors.py
    trunk/blender/scons/scons-local/SCons/Executor.py
    trunk/blender/scons/scons-local/SCons/Job.py
    trunk/blender/scons/scons-local/SCons/Memoize.py
    trunk/blender/scons/scons-local/SCons/Node/Alias.py
    trunk/blender/scons/scons-local/SCons/Node/FS.py
    trunk/blender/scons/scons-local/SCons/Node/Python.py
    trunk/blender/scons/scons-local/SCons/Node/__init__.py
    trunk/blender/scons/scons-local/SCons/Options/BoolOption.py
    trunk/blender/scons/scons-local/SCons/Options/EnumOption.py
    trunk/blender/scons/scons-local/SCons/Options/ListOption.py
    trunk/blender/scons/scons-local/SCons/Options/PackageOption.py
    trunk/blender/scons/scons-local/SCons/Options/PathOption.py
    trunk/blender/scons/scons-local/SCons/Options/__init__.py
    trunk/blender/scons/scons-local/SCons/PathList.py
    trunk/blender/scons/scons-local/SCons/Platform/__init__.py
    trunk/blender/scons/scons-local/SCons/Platform/aix.py
    trunk/blender/scons/scons-local/SCons/Platform/cygwin.py
    trunk/blender/scons/scons-local/SCons/Platform/darwin.py
    trunk/blender/scons/scons-local/SCons/Platform/hpux.py
    trunk/blender/scons/scons-local/SCons/Platform/irix.py
    trunk/blender/scons/scons-local/SCons/Platform/os2.py
    trunk/blender/scons/scons-local/SCons/Platform/posix.py
    trunk/blender/scons/scons-local/SCons/Platform/sunos.py
    trunk/blender/scons/scons-local/SCons/Platform/win32.py
    trunk/blender/scons/scons-local/SCons/SConf.py
    trunk/blender/scons/scons-local/SCons/SConsign.py
    trunk/blender/scons/scons-local/SCons/Scanner/C.py
    trunk/blender/scons/scons-local/SCons/Scanner/D.py
    trunk/blender/scons/scons-local/SCons/Scanner/Dir.py
    trunk/blender/scons/scons-local/SCons/Scanner/Fortran.py
    trunk/blender/scons/scons-local/SCons/Scanner/IDL.py
    trunk/blender/scons/scons-local/SCons/Scanner/LaTeX.py
    trunk/blender/scons/scons-local/SCons/Scanner/Prog.py
    trunk/blender/scons/scons-local/SCons/Scanner/RC.py
    trunk/blender/scons/scons-local/SCons/Scanner/__init__.py
    trunk/blender/scons/scons-local/SCons/Script/Interactive.py
    trunk/blender/scons/scons-local/SCons/Script/Main.py
    trunk/blender/scons/scons-local/SCons/Script/SConsOptions.py
    trunk/blender/scons/scons-local/SCons/Script/SConscript.py
    trunk/blender/scons/scons-local/SCons/Script/__init__.py
    trunk/blender/scons/scons-local/SCons/Sig.py
    trunk/blender/scons/scons-local/SCons/Subst.py
    trunk/blender/scons/scons-local/SCons/Taskmaster.py
    trunk/blender/scons/scons-local/SCons/Tool/386asm.py
    trunk/blender/scons/scons-local/SCons/Tool/BitKeeper.py
    trunk/blender/scons/scons-local/SCons/Tool/CVS.py
    trunk/blender/scons/scons-local/SCons/Tool/FortranCommon.py
    trunk/blender/scons/scons-local/SCons/Tool/GettextCommon.py
    trunk/blender/scons/scons-local/SCons/Tool/JavaCommon.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/__init__.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/arch.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/common.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/netframework.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/sdk.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/vc.py
    trunk/blender/scons/scons-local/SCons/Tool/MSCommon/vs.py
    trunk/blender/scons/scons-local/SCons/Tool/Perforce.py
    trunk/blender/scons/scons-local/SCons/Tool/PharLapCommon.py
    trunk/blender/scons/scons-local/SCons/Tool/RCS.py
    trunk/blender/scons/scons-local/SCons/Tool/SCCS.py
    trunk/blender/scons/scons-local/SCons/Tool/Subversion.py
    trunk/blender/scons/scons-local/SCons/Tool/__init__.py
    trunk/blender/scons/scons-local/SCons/Tool/aixc++.py
    trunk/blender/scons/scons-local/SCons/Tool/aixcc.py
    trunk/blender/scons/scons-local/SCons/Tool/aixf77.py
    trunk/blender/scons/scons-local/SCons/Tool/aixlink.py
    trunk/blender/scons/scons-local/SCons/Tool/applelink.py
    trunk/blender/scons/scons-local/SCons/Tool/ar.py
    trunk/blender/scons/scons-local/SCons/Tool/as.py
    trunk/blender/scons/scons-local/SCons/Tool/bcc32.py
    trunk/blender/scons/scons-local/SCons/Tool/c++.py
    trunk/blender/scons/scons-local/SCons/Tool/cc.py
    trunk/blender/scons/scons-local/SCons/Tool/cvf.py
    trunk/blender/scons/scons-local/SCons/Tool/default.py
    trunk/blender/scons/scons-local/SCons/Tool/dmd.py
    trunk/blender/scons/scons-local/SCons/Tool/dvi.py
    trunk/blender/scons/scons-local/SCons/Tool/dvipdf.py
    trunk/blender/scons/scons-local/SCons/Tool/dvips.py
    trunk/blender/scons/scons-local/SCons/Tool/f03.py
    trunk/blender/scons/scons-local/SCons/Tool/f77.py
    trunk/blender/scons/scons-local/SCons/Tool/f90.py
    trunk/blender/scons/scons-local/SCons/Tool/f95.py
    trunk/blender/scons/scons-local/SCons/Tool/filesystem.py
    trunk/blender/scons/scons-local/SCons/Tool/fortran.py
    trunk/blender/scons/scons-local/SCons/Tool/g++.py
    trunk/blender/scons/scons-local/SCons/Tool/g77.py
    trunk/blender/scons/scons-local/SCons/Tool/gas.py
    trunk/blender/scons/scons-local/SCons/Tool/gcc.py
    trunk/blender/scons/scons-local/SCons/Tool/gettext.py
    trunk/blender/scons/scons-local/SCons/Tool/gfortran.py
    trunk/blender/scons/scons-local/SCons/Tool/gnulink.py
    trunk/blender/scons/scons-local/SCons/Tool/gs.py
    trunk/blender/scons/scons-local/SCons/Tool/hpc++.py
    trunk/blender/scons/scons-local/SCons/Tool/hpcc.py
    trunk/blender/scons/scons-local/SCons/Tool/hplink.py
    trunk/blender/scons/scons-local/SCons/Tool/icc.py
    trunk/blender/scons/scons-local/SCons/Tool/icl.py
    trunk/blender/scons/scons-local/SCons/Tool/ifl.py
    trunk/blender/scons/scons-local/SCons/Tool/ifort.py
    trunk/blender/scons/scons-local/SCons/Tool/ilink.py
    trunk/blender/scons/scons-local/SCons/Tool/ilink32.py
    trunk/blender/scons/scons-local/SCons/Tool/install.py
    trunk/blender/scons/scons-local/SCons/Tool/intelc.py
    trunk/blender/scons/scons-local/SCons/Tool/ipkg.py
    trunk/blender/scons/scons-local/SCons/Tool/jar.py
    trunk/blender/scons/scons-local/SCons/Tool/javac.py
    trunk/blender/scons/scons-local/SCons/Tool/javah.py
    trunk/blender/scons/scons-local/SCons/Tool/latex.py
    trunk/blender/scons/scons-local/SCons/Tool/lex.py
    trunk/blender/scons/scons-local/SCons/Tool/link.py
    trunk/blender/scons/scons-local/SCons/Tool/linkloc.py
    trunk/blender/scons/scons-local/SCons/Tool/m4.py
    trunk/blender/scons/scons-local/SCons/Tool/masm.py
    trunk/blender/scons/scons-local/SCons/Tool/midl.py
    trunk/blender/scons/scons-local/SCons/Tool/mingw.py
    trunk/blender/scons/scons-local/SCons/Tool/msgfmt.py
    trunk/blender/scons/scons-local/SCons/Tool/msginit.py
    trunk/blender/scons/scons-local/SCons/Tool/msgmerge.py
    trunk/blender/scons/scons-local/SCons/Tool/mslib.py
    trunk/blender/scons/scons-local/SCons/Tool/mslink.py
    trunk/blender/scons/scons-local/SCons/Tool/mssdk.py
    trunk/blender/scons/scons-local/SCons/Tool/msvc.py
    trunk/blender/scons/scons-local/SCons/Tool/msvs.py
    trunk/blender/scons/scons-local/SCons/Tool/mwcc.py
    trunk/blender/scons/scons-local/SCons/Tool/mwld.py
    trunk/blender/scons/scons-local/SCons/Tool/nasm.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/__init__.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/ipk.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/msi.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/rpm.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/src_tarbz2.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/src_targz.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/src_zip.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/tarbz2.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/targz.py
    trunk/blender/scons/scons-local/SCons/Tool/packaging/zip.py
    trunk/blender/scons/scons-local/SCons/Tool/pdf.py
    trunk/blender/scons/scons-local/SCons/Tool/pdflatex.py
    trunk/blender/scons/scons-local/SCons/Tool/pdftex.py
    trunk/blender/scons/scons-local/SCons/Tool/qt.py
    trunk/blender/scons/scons-local/SCons/Tool/rmic.py
    trunk/blender/scons/scons-local/SCons/Tool/rpcgen.py
    trunk/blender/scons/scons-local/SCons/Tool/rpm.py
    trunk/blender/scons/scons-local/SCons/Tool/rpmutils.py
    trunk/blender/scons/scons-local/SCons/Tool/sgiar.py
    trunk/blender/scons/scons-local/SCons/Tool/sgic++.py
    trunk/blender/scons/scons-local/SCons/Tool/sgicc.py
    trunk/blender/scons/scons-local/SCons/Tool/sgilink.py
    trunk/blender/scons/scons-local/SCons/Tool/sunar.py
    trunk/blender/scons/scons-local/SCons/Tool/sunc++.py
    trunk/blender/scons/scons-local/SCons/Tool/suncc.py
    trunk/blender/scons/scons-local/SCons/Tool/sunf77.py
    trunk/blender/scons/scons-local/SCons/Tool/sunf90.py
    trunk/blender/scons/scons-local/SCons/Tool/sunf95.py
    trunk/blender/scons/scons-local/SCons/Tool/sunlink.py
    trunk/blender/scons/scons-local/SCons/Tool/swig.py
    trunk/blender/scons/scons-local/SCons/Tool/tar.py
    trunk/blender/scons/scons-local/SCons/Tool/tex.py
    trunk/blender/scons/scons-local/SCons/Tool/textfile.py
    trunk/blender/scons/scons-local/SCons/Tool/tlib.py
    trunk/blender/scons/scons-local/SCons/Tool/wix.py
    trunk/blender/scons/scons-local/SCons/Tool/xgettext.py
    trunk/blender/scons/scons-local/SCons/Tool/yacc.py
    trunk/blender/scons/scons-local/SCons/Tool/zip.py
    trunk/blender/scons/scons-local/SCons/Util.py
    trunk/blender/scons/scons-local/SCons/Variables/BoolVariable.py
    trunk/blender/scons/scons-local/SCons/Variables/EnumVariable.py
    trunk/blender/scons/scons-local/SCons/Variables/ListVariable.py
    trunk/blender/scons/scons-local/SCons/Variables/PackageVariable.py
    trunk/blender/scons/scons-local/SCons/Variables/PathVariable.py
    trunk/blender/scons/scons-local/SCons/Variables/__init__.py
    trunk/blender/scons/scons-local/SCons/Warnings.py
    trunk/blender/scons/scons-local/SCons/__init__.py
    trunk/blender/scons/scons-local/SCons/compat/__init__.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_builtins.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_collections.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_dbm.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_hashlib.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_io.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_sets.py
    trunk/blender/scons/scons-local/SCons/compat/_scons_subprocess.py
    trunk/blender/scons/scons-local/SCons/cpp.py
    trunk/blender/scons/scons-local/SCons/dblite.py
    trunk/blender/scons/scons-local/SCons/exitfuncs.py
    trunk/blender/source/blender/blenkernel/BKE_treehash.h
    trunk/blender/source/blender/blenkernel/intern/treehash.c
    trunk/blender/source/blender/blenlib/BLI_compiler_attrs.h
    trunk/blender/source/blender/blenlib/BLI_sort.h
    trunk/blender/source/blender/blenlib/BLI_task.h
    trunk/blender/source/blender/blenlib/intern/sort.c
    trunk/blender/source/blender/blenlib/intern/task.c
    trunk/blender/source/blender/blenloader/intern/versioning_defaults.c
    trunk/blender/source/blender/bmesh/operators/bmo_connect_nonplanar.c
    trunk/blender/source/blender/compositor/intern/COM_Debug.cpp
    trunk/blender/source/blender/compositor/intern/COM_Debug.h
    trunk/blender/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
    trunk/blender/source/blender/compositor/operations/COM_ConvertOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ConvertOperation.h
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h
    trunk/blender/source/blender/freestyle/CMakeLists.txt
    trunk/blender/source/blender/imbuf/intern/oiio/openimageio_api.cpp
    trunk/blender/source/blender/imbuf/intern/oiio/openimageio_api.h
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_blackbody.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectTransform.c


Property changes on: trunk/blender/doc/python_api/examples/bpy.types.UIList.2.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/extern/libmv/libmv-capi_intern.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/extern/libmv/third_party/ceres/include/ceres/c_api.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/extern/libmv/third_party/ceres/include/ceres/covariance.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/blender/extern/rangetree/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: trunk/blender/extern/wcwidth/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: trunk/blender/intern/atomic/atomic_ops.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl	2013-10-15 20:15:45 UTC (rev 60789)
+++ trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl	2013-10-15 23:11:41 UTC (rev 60790)
@@ -1,31 +1,31 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-#include "stdosl.h"
-
-shader node_blackbody(
-	float Temperature = 1200.0,
-	output color Color = 0.0)
-{
-	color rgb = blackbody(Temperature);
-	
-	/* Scale by luminance */
-	float l = luminance(rgb);
-	if (l != 0.0)
-		rgb /= l;
-	Color = rgb;
-}
-
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+#include "stdosl.h"
+
+shader node_blackbody(
+	float Temperature = 1200.0,
+	output color Color = 0.0)
+{
+	color rgb = blackbody(Temperature);
+	
+	/* Scale by luminance */
+	float l = luminance(rgb);
+	if (l != 0.0)
+		rgb /= l;
+	Color = rgb;
+}
+


Property changes on: trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl	2013-10-15 20:15:45 UTC (rev 60789)
+++ trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl	2013-10-15 23:11:41 UTC (rev 60790)
@@ -1,27 +1,27 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-#include "stdosl.h"
-
-shader node_combine_hsv(
-	float H = 0.0,
-	float S = 0.0,
-	float V = 0.0,
-	output color Color = 0.8)
-{
-	Color = color("hsv", H, S, V);	
-}
-
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+#include "stdosl.h"
+
+shader node_combine_hsv(
+	float H = 0.0,
+	float S = 0.0,
+	float V = 0.0,
+	output color Color = 0.8)
+{
+	Color = color("hsv", H, S, V);	
+}
+


Property changes on: trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl	2013-10-15 20:15:45 UTC (rev 60789)
+++ trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl	2013-10-15 23:11:41 UTC (rev 60790)
@@ -1,31 +1,31 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-#include "stdosl.h"
-#include "node_color.h"
-
-shader node_separate_hsv(
-	color Color = 0.8,
-	output float H = 0.0,
-	output float S = 0.0,
-	output float V = 0.0)
-{
-	color col = rgb_to_hsv(Color);
-	
-	H = col[0];
-	S = col[1];
-	V = col[2];
-}
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+#include "stdosl.h"
+#include "node_color.h"
+
+shader node_separate_hsv(
+	color Color = 0.8,
+	output float H = 0.0,
+	output float S = 0.0,
+	output float V = 0.0)
+{
+	color col = rgb_to_hsv(Color);
+	
+	H = col[0];
+	S = col[1];
+	V = col[2];
+}


Property changes on: trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/blender/intern/cycles/kernel/shaders/node_vector_transform.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_vector_transform.osl	2013-10-15 20:15:45 UTC (rev 60789)
+++ trunk/blender/intern/cycles/kernel/shaders/node_vector_transform.osl	2013-10-15 23:11:41 UTC (rev 60790)
@@ -1,36 +1,36 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-#include "stdosl.h"
-
-shader node_vector_transform(
-	string type = "Vector",
-	string convert_from = "world",
-	string convert_to = "object",
-	vector VectorIn = vector(0.0, 0.0, 0.0),
-	output vector VectorOut = vector(0.0, 0.0, 0.0))
-{
-	if (type == "Vector" || type == "Normal") {
-		VectorOut = transform(convert_from, convert_to, VectorIn);
-		if (type == "Normal")
-			VectorOut = normalize(VectorOut);
-	}
-	else if (type == "Point") {
-		point Point = (point)VectorIn;
-		VectorOut = transform(convert_from, convert_to, Point);
-	}
-}
-
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list