Revision: 58832
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58832
Author: elubie
Date: 2013-08-02 18:14:44 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Merged revision(s) 58771-58831 from trunk/blender
Modified Paths:
--------------
branches/asset-browser/extern/libmv/libmv-capi.cc
branches/asset-browser/intern/cycles/blender/addon/ui.py
branches/asset-browser/intern/cycles/blender/blender_shader.cpp
branches/asset-browser/intern/cycles/blender/blender_sync.cpp
branches/asset-browser/intern/cycles/kernel/CMakeLists.txt
branches/asset-browser/intern/cycles/kernel/kernel_displace.h
branches/asset-browser/intern/cycles/kernel/kernel_emission.h
branches/asset-browser/intern/cycles/kernel/kernel_object.h
branches/asset-browser/intern/cycles/kernel/kernel_path.h
branches/asset-browser/intern/cycles/kernel/kernel_shader.h
branches/asset-browser/intern/cycles/kernel/kernel_types.h
branches/asset-browser/intern/cycles/kernel/osl/osl_services.cpp
branches/asset-browser/intern/cycles/kernel/osl/osl_services.h
branches/asset-browser/intern/cycles/kernel/shaders/CMakeLists.txt
branches/asset-browser/intern/cycles/kernel/shaders/node_light_path.osl
branches/asset-browser/intern/cycles/kernel/svm/svm.h
branches/asset-browser/intern/cycles/kernel/svm/svm_light_path.h
branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
branches/asset-browser/intern/cycles/render/CMakeLists.txt
branches/asset-browser/intern/cycles/render/graph.h
branches/asset-browser/intern/cycles/render/nodes.cpp
branches/asset-browser/intern/cycles/render/nodes.h
branches/asset-browser/intern/cycles/render/shader.cpp
branches/asset-browser/intern/cycles/render/shader.h
branches/asset-browser/intern/cycles/render/svm.cpp
branches/asset-browser/intern/ghost/CMakeLists.txt
branches/asset-browser/intern/ghost/SConscript
branches/asset-browser/release/scripts/presets/cycles/sampling/final.py
branches/asset-browser/release/scripts/presets/cycles/sampling/preview.py
branches/asset-browser/release/scripts/startup/nodeitems_builtins.py
branches/asset-browser/source/blender/blenkernel/BKE_blender.h
branches/asset-browser/source/blender/blenkernel/BKE_node.h
branches/asset-browser/source/blender/blenkernel/intern/cdderivedmesh.c
branches/asset-browser/source/blender/blenkernel/intern/node.c
branches/asset-browser/source/blender/blenkernel/intern/pointcache.c
branches/asset-browser/source/blender/blenkernel/intern/smoke.c
branches/asset-browser/source/blender/blenlib/BLI_ghash.h
branches/asset-browser/source/blender/blenlib/BLI_math_geom.h
branches/asset-browser/source/blender/blenlib/BLI_math_vector.h
branches/asset-browser/source/blender/blenlib/intern/BLI_ghash.c
branches/asset-browser/source/blender/blenlib/intern/math_geom.c
branches/asset-browser/source/blender/blenloader/intern/readfile.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_marking.c
branches/asset-browser/source/blender/bmesh/operators/bmo_dupe.c
branches/asset-browser/source/blender/bmesh/operators/bmo_edgenet.c
branches/asset-browser/source/blender/bmesh/operators/bmo_join_triangles.c
branches/asset-browser/source/blender/collada/MeshImporter.cpp
branches/asset-browser/source/blender/editors/sculpt_paint/paint_stroke.c
branches/asset-browser/source/blender/editors/sculpt_paint/sculpt.c
branches/asset-browser/source/blender/editors/space_logic/logic_window.c
branches/asset-browser/source/blender/editors/space_node/drawnode.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_tools.c
branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
branches/asset-browser/source/blender/editors/space_view3d/drawvolume.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_select.c
branches/asset-browser/source/blender/makesdna/DNA_mesh_types.h
branches/asset-browser/source/blender/makesdna/DNA_node_types.h
branches/asset-browser/source/blender/makesdna/DNA_outliner_types.h
branches/asset-browser/source/blender/makesdna/DNA_sound_types.h
branches/asset-browser/source/blender/makesrna/intern/rna_brush.c
branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
branches/asset-browser/source/blender/makesrna/intern/rna_object_force.c
branches/asset-browser/source/blender/modifiers/intern/MOD_skin.c
branches/asset-browser/source/blender/nodes/CMakeLists.txt
branches/asset-browser/source/blender/nodes/NOD_shader.h
branches/asset-browser/source/blender/nodes/NOD_static_types.h
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/asset-browser/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/asset-browser/source/blender/render/intern/source/voxeldata.c
Added Paths:
-----------
branches/asset-browser/intern/cycles/kernel/shaders/node_blackbody.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/asset-browser/intern/cycles/kernel/svm/svm_blackbody.h
branches/asset-browser/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/asset-browser/intern/cycles/kernel/svm/svm_vector_transform.h
branches/asset-browser/intern/cycles/render/blackbody.cpp
branches/asset-browser/intern/cycles/render/blackbody.h
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_blackbody.c
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
Property Changed:
----------------
branches/asset-browser/
branches/asset-browser/source/blender/editors/space_outliner/
Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:43077-44985,44987-49474,49476-58770
+ /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:43077-44985,44987-49474,49476-58831
Modified: branches/asset-browser/extern/libmv/libmv-capi.cc
===================================================================
--- branches/asset-browser/extern/libmv/libmv-capi.cc 2013-08-02 18:00:12 UTC
(rev 58831)
+++ branches/asset-browser/extern/libmv/libmv-capi.cc 2013-08-02 18:14:44 UTC
(rev 58832)
@@ -1014,6 +1014,7 @@
*principal_y = camera_intrinsics->principal_point_y();
*k1 = camera_intrinsics->k1();
*k2 = camera_intrinsics->k2();
+ *k3 = camera_intrinsics->k3();
}
void libmv_cameraIntrinsicsUndistortByte(const struct libmv_CameraIntrinsics
*libmv_intrinsics,
Modified: branches/asset-browser/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/asset-browser/intern/cycles/blender/addon/ui.py 2013-08-02
18:00:12 UTC (rev 58831)
+++ branches/asset-browser/intern/cycles/blender/addon/ui.py 2013-08-02
18:14:44 UTC (rev 58832)
@@ -70,8 +70,10 @@
sub = row.row()
sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
sub.prop(cscene, "progressive")
- row.prop(cscene, "squared_samples")
+ if not cscene.progressive:
+ row.prop(cscene, "squared_samples")
+
split = layout.split()
col = split.column()
Modified: branches/asset-browser/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/asset-browser/intern/cycles/blender/blender_shader.cpp
2013-08-02 18:00:12 UTC (rev 58831)
+++ branches/asset-browser/intern/cycles/blender/blender_shader.cpp
2013-08-02 18:14:44 UTC (rev 58832)
@@ -231,6 +231,12 @@
else if (b_node.is_a(&RNA_ShaderNodeCombineRGB)) {
node = new CombineRGBNode();
}
+ else if (b_node.is_a(&RNA_ShaderNodeSeparateHSV)) {
+ node = new SeparateHSVNode();
+ }
+ else if (b_node.is_a(&RNA_ShaderNodeCombineHSV)) {
+ node = new CombineHSVNode();
+ }
else if (b_node.is_a(&RNA_ShaderNodeHueSaturation)) {
node = new HSVNode();
}
@@ -250,6 +256,14 @@
vmath->type =
VectorMathNode::type_enum[b_vector_math_node.operation()];
node = vmath;
}
+ else if (b_node.is_a(&RNA_ShaderNodeVectorTransform)) {
+ BL::ShaderNodeVectorTransform b_vector_transform_node(b_node);
+ VectorTransformNode *vtransform = new VectorTransformNode();
+ vtransform->type =
VectorTransformNode::type_enum[b_vector_transform_node.type()];
+ vtransform->convert_from =
VectorTransformNode::convert_space_enum[b_vector_transform_node.convert_from()];
+ vtransform->convert_to =
VectorTransformNode::convert_space_enum[b_vector_transform_node.convert_to()];
+ node = vtransform;
+ }
else if (b_node.is_a(&RNA_ShaderNodeNormal)) {
BL::Node::outputs_iterator out_it;
b_node.outputs.begin(out_it);
@@ -400,6 +414,9 @@
else if (b_node.is_a(&RNA_ShaderNodeWavelength)) {
node = new WavelengthNode();
}
+ else if (b_node.is_a(&RNA_ShaderNodeBlackbody)) {
+ node = new BlackbodyNode();
+ }
else if (b_node.is_a(&RNA_ShaderNodeLightPath)) {
node = new LightPathNode();
}
Modified: branches/asset-browser/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/asset-browser/intern/cycles/blender/blender_sync.cpp
2013-08-02 18:00:12 UTC (rev 58831)
+++ branches/asset-browser/intern/cycles/blender/blender_sync.cpp
2013-08-02 18:14:44 UTC (rev 58832)
@@ -321,7 +321,7 @@
render_layer.bound_samples = (use_layer_samples == 1);
if(use_layer_samples != 2) {
int samples = b_rlay->samples();
- if(get_boolean(cscene, "squared_samples"))
+ if(get_boolean(cscene, "squared_samples") &&
!(get_boolean(cscene, "progressive")))
render_layer.samples = samples *
samples;
else
render_layer.samples = samples;
@@ -414,10 +414,9 @@
int preview_samples = get_int(cscene, "preview_samples");
int preview_aa_samples = get_int(cscene, "preview_aa_samples");
+ /* Squared samples for Non-Progressive only */
if(get_boolean(cscene, "squared_samples")) {
- samples = samples * samples;
aa_samples = aa_samples * aa_samples;
- preview_samples = preview_samples * preview_samples;
preview_aa_samples = preview_aa_samples * preview_aa_samples;
}
Modified: branches/asset-browser/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/asset-browser/intern/cycles/kernel/CMakeLists.txt 2013-08-02
18:00:12 UTC (rev 58831)
+++ branches/asset-browser/intern/cycles/kernel/CMakeLists.txt 2013-08-02
18:14:44 UTC (rev 58832)
@@ -72,6 +72,7 @@
set(SRC_SVM_HEADERS
svm/svm.h
svm/svm_attribute.h
+ svm/svm_blackbody.h
svm/svm_camera.h
svm/svm_closure.h
svm/svm_convert.h
@@ -99,11 +100,13 @@
svm/svm_normal.h
svm/svm_ramp.h
svm/svm_sepcomb_rgb.h
+ svm/svm_sepcomb_hsv.h
svm/svm_sky.h
svm/svm_tex_coord.h
svm/svm_texture.h
svm/svm_types.h
svm/svm_value.h
+ svm/svm_vector_transform.h
svm/svm_voronoi.h
svm/svm_wave.h
)
Modified: branches/asset-browser/intern/cycles/kernel/kernel_displace.h
===================================================================
--- branches/asset-browser/intern/cycles/kernel/kernel_displace.h
2013-08-02 18:00:12 UTC (rev 58831)
+++ branches/asset-browser/intern/cycles/kernel/kernel_displace.h
2013-08-02 18:14:44 UTC (rev 58832)
@@ -57,7 +57,7 @@
#endif
/* setup shader data */
- shader_setup_from_background(kg, &sd, &ray);
+ shader_setup_from_background(kg, &sd, &ray, 0);
/* evaluate */
int flag = 0; /* we can't know which type of BSDF this is for */
Modified: branches/asset-browser/intern/cycles/kernel/kernel_emission.h
===================================================================
--- branches/asset-browser/intern/cycles/kernel/kernel_emission.h
2013-08-02 18:00:12 UTC (rev 58831)
+++ branches/asset-browser/intern/cycles/kernel/kernel_emission.h
2013-08-02 18:14:44 UTC (rev 58832)
@@ -21,7 +21,7 @@
/* Direction Emission */
__device_noinline float3 direct_emissive_eval(KernelGlobals *kg, float rando,
- LightSample *ls, float u, float v, float3 I, differential3 dI, float t,
float time)
+ LightSample *ls, float u, float v, float3 I, differential3 dI, float t,
float time, int bounce)
{
/* setup shading at emitter */
ShaderData sd;
@@ -41,7 +41,7 @@
#ifdef __CAMERA_MOTION__
ray.time = time;
#endif
- shader_setup_from_background(kg, &sd, &ray);
+ shader_setup_from_background(kg, &sd, &ray, bounce+1);
eval = shader_eval_background(kg, &sd, 0,
SHADER_CONTEXT_EMISSION);
}
else
@@ -49,10 +49,10 @@
{
#ifdef __HAIR__
if(ls->type == LIGHT_STRAND)
- shader_setup_from_sample(kg, &sd, ls->P, ls->Ng, I,
ls->shader, ls->object, ls->prim, u, v, t, time, ls->prim);
+ shader_setup_from_sample(kg, &sd, ls->P, ls->Ng, I,
ls->shader, ls->object, ls->prim, u, v, t, time, bounce+1, ls->prim);
else
#endif
- shader_setup_from_sample(kg, &sd, ls->P, ls->Ng, I,
ls->shader, ls->object, ls->prim, u, v, t, time, ~0);
+ shader_setup_from_sample(kg, &sd, ls->P, ls->Ng, I,
ls->shader, ls->object, ls->prim, u, v, t, time, bounce+1, ~0);
ls->Ng = sd.Ng;
@@ -74,7 +74,7 @@
__device_noinline bool direct_emission(KernelGlobals *kg, ShaderData *sd, int
lindex,
float randt, float rando, float randu, float randv, Ray *ray, BsdfEval
*eval,
- bool *is_lamp)
+ bool *is_lamp, int bounce)
{
LightSample ls;
@@ -97,7 +97,7 @@
differential3 dD = differential3_zero();
/* evaluate closure */
- float3 light_eval = direct_emissive_eval(kg, rando, &ls, randu, randv,
-ls.D, dD, ls.t, sd->time);
+ float3 light_eval = direct_emissive_eval(kg, rando, &ls, randu, randv,
-ls.D, dD, ls.t, sd->time, bounce);
if(is_zero(light_eval))
return false;
@@ -185,7 +185,7 @@
/* Indirect Lamp Emission */
-__device_noinline bool indirect_lamp_emission(KernelGlobals *kg, Ray *ray, int
path_flag, float bsdf_pdf, float randt, float3 *emission)
+__device_noinline bool indirect_lamp_emission(KernelGlobals *kg, Ray *ray, int
path_flag, float bsdf_pdf, float randt, float3 *emission, int bounce)
{
LightSample ls;
int lamp = lamp_light_eval_sample(kg, randt);
@@ -209,7 +209,7 @@
/* todo: missing texture coordinates */
float u = 0.0f;
float v = 0.0f;
- float3 L = direct_emissive_eval(kg, 0.0f, &ls, u, v, -ray->D, ray->dD,
ls.t, ray->time);
+ float3 L = direct_emissive_eval(kg, 0.0f, &ls, u, v, -ray->D, ray->dD,
ls.t, ray->time, bounce);
if(!(path_flag & PATH_RAY_MIS_SKIP)) {
/* multiple importance sampling, get regular light pdf,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
