[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42394] branches/soc-2011-tomato: Merging r42350 through r42393 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sun Dec 4 13:32:37 CET 2011
Revision: 42394
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42394
Author: nazgul
Date: 2011-12-04 12:32:26 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Merging r42350 through r42393 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42350
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42393
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp
branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.h
branches/soc-2011-tomato/intern/cycles/util/util_boundbox.h
branches/soc-2011-tomato/source/blender/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/BKE_group.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_key_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_material_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_meta_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_invert.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_defs.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42349
+ /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42393
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-12-04 12:32:26 UTC (rev 42394)
@@ -857,14 +857,23 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ if(MSVC10)
+ set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+ else()
+ set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ endif()
set(BOOST_LIBRARIES
- optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
- libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
- debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
- libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
- set(BOOST_LIBPATH ${BOOST}/lib)
+ optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
+ optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+ if(MSVC10)
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ else()
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2011-12-04 12:32:26 UTC (rev 42394)
@@ -165,6 +165,11 @@
BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2011-12-04 12:32:26 UTC (rev 42394)
@@ -154,6 +154,7 @@
WITH_BF_OPENMP = True
+#Cycles
WITH_BF_CYCLES = True
WITH_BF_OIIO = True
@@ -169,6 +170,11 @@
BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2011-12-04 12:32:26 UTC (rev 42394)
@@ -87,6 +87,7 @@
"gpu",
"mathutils",
"mathutils.geometry",
+ "mathutils.noise",
)
FILTER_BPY_TYPES = ("bpy_struct", "Operator", "ID") # allow
@@ -1190,6 +1191,8 @@
fw(" mathutils.rst\n\n")
if "mathutils.geometry" not in EXCLUDE_MODULES:
fw(" mathutils.geometry.rst\n\n")
+ if "mathutils.noise" not in EXCLUDE_MODULES:
+ fw(" mathutils.noise.rst\n\n")
if "bgl" not in EXCLUDE_MODULES:
fw(" bgl.rst\n\n")
if "blf" not in EXCLUDE_MODULES:
@@ -1329,6 +1332,10 @@
import mathutils.geometry as module
pymodule2sphinx(BASEPATH, "mathutils.geometry", module, "Geometry Utilities")
+ if "mathutils.noise" not in EXCLUDE_MODULES:
+ import mathutils.noise as module
+ pymodule2sphinx(BASEPATH, "mathutils.noise", module, "Noise Utilities")
+
if "blf" not in EXCLUDE_MODULES:
import blf as module
pymodule2sphinx(BASEPATH, "blf", module, "Font Drawing")
Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2011-12-04 12:32:26 UTC (rev 42394)
@@ -435,6 +435,9 @@
else if(string_iequals(node.name(), "add_closure")) {
snode = new AddClosureNode();
}
+ else if(string_iequals(node.name(), "invert")) {
+ snode = new InvertNode();
+ }
else if(string_iequals(node.name(), "mix")) {
MixNode *mix = new MixNode();
xml_read_enum(&mix->type, MixNode::type_enum, node, "type");
@@ -454,6 +457,9 @@
xml_read_ustring(&attr->attribute, node, "attribute");
snode = attr;
}
+ else if(string_iequals(node.name(), "camera")) {
+ snode = new CameraNode();
+ }
else if(string_iequals(node.name(), "fresnel")) {
snode = new FresnelNode();
}
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp 2011-12-04 12:32:26 UTC (rev 42394)
@@ -127,11 +127,9 @@
switch(b_node.type()) {
/* not supported */
- case BL::ShaderNode::type_CAMERA: break;
case BL::ShaderNode::type_CURVE_RGB: break;
case BL::ShaderNode::type_CURVE_VEC: break;
case BL::ShaderNode::type_GEOMETRY: break;
- case BL::ShaderNode::type_INVERT: break;
case BL::ShaderNode::type_MATERIAL: break;
case BL::ShaderNode::type_MATERIAL_EXT: break;
case BL::ShaderNode::type_NORMAL: break;
@@ -155,6 +153,14 @@
node = value;
break;
}
+ case BL::ShaderNode::type_CAMERA: {
+ node = new CameraNode();
+ break;
+ }
+ case BL::ShaderNode::type_INVERT: {
+ node = new InvertNode();
+ break;
+ }
case BL::ShaderNode::type_MIX_RGB: {
BL::ShaderNodeMixRGB b_mix_node(b_node);
MixNode *mix = new MixNode();
Modified: branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp 2011-12-04 12:32:26 UTC (rev 42394)
@@ -59,16 +59,18 @@
Mesh::Triangle t = mesh->triangles[j];
Reference ref;
- ref.prim_index = j;
- ref.prim_object = i;
-
for(int k = 0; k < 3; k++) {
float3 pt = mesh->verts[t.v[k]];
ref.bounds.grow(pt);
}
- references.push_back(ref);
- root.bounds.grow(ref.bounds);
+ if(ref.bounds.valid()) {
+ ref.prim_index = j;
+ ref.prim_object = i;
+
+ references.push_back(ref);
+ root.bounds.grow(ref.bounds);
+ }
}
}
Modified: branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt 2011-12-04 12:32:26 UTC (rev 42394)
@@ -54,6 +54,7 @@
svm/svm.h
svm/svm_attribute.h
svm/svm_bsdf.h
+ svm/svm_camera.h
svm/svm_closure.h
svm/svm_convert.h
svm/svm_displace.h
@@ -62,6 +63,7 @@
svm/svm_gradient.h
svm/svm_hsv.h
svm/svm_image.h
+ svm/svm_invert.h
svm/svm_light_path.h
svm/svm_magic.h
svm/svm_mapping.h
Modified: branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-04 12:06:01 UTC (rev 42393)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-04 12:32:26 UTC (rev 42394)
@@ -7,6 +7,7 @@
node_background.osl
node_blend_texture.osl
node_bump.osl
+ node_camera.osl
node_clouds_texture.osl
node_convert_from_color.osl
node_convert_from_float.osl
@@ -23,6 +24,7 @@
node_glossy_bsdf.osl
node_hsv.osl
node_image_texture.osl
+ node_invert.osl
node_light_path.osl
node_magic_texture.osl
node_mapping.osl
Copied: branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_camera.osl (from rev 42393, trunk/blender/intern/cycles/kernel/osl/nodes/node_camera.osl)
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_camera.osl (rev 0)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_camera.osl 2011-12-04 12:32:26 UTC (rev 42394)
@@ -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,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list