[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55841] branches/soc-2008-mxcurioni: svn merge ^/trunk/blender -r55815:55840
Sergey Sharybin
sergey.vfx at gmail.com
Sat Apr 6 15:24:35 CEST 2013
Revision: 55841
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55841
Author: nazgul
Date: 2013-04-06 13:24:34 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r55815:55840
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55815
Modified Paths:
--------------
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_color.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/tile.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/runtime.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/undofile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_despeckle.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_pixelate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_poke.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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/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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55815
+ /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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55840
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp 2013-04-06 13:24:34 UTC (rev 55841)
@@ -549,7 +549,7 @@
session->progress.get_tile(tile, total_time, tile_time);
sample = session->progress.get_sample();
- samples_per_tile = session->params.samples;
+ samples_per_tile = session->tile_manager.num_samples;
if(samples_per_tile && tile_total)
progress = ((float)sample / (float)(tile_total * samples_per_tile));
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h 2013-04-06 13:24:34 UTC (rev 55841)
@@ -100,7 +100,6 @@
Transform rastertocamera = kernel_data.cam.rastertocamera;
float3 Pcamera = transform_perspective(&rastertocamera, make_float3(raster_x, raster_y, 0.0f));
- ray->P = Pcamera;
ray->D = make_float3(0.0f, 0.0f, 1.0f);
/* modify ray for depth of field */
@@ -116,11 +115,12 @@
/* update ray for effect of lens */
float3 lensuvw = make_float3(lensuv.x, lensuv.y, 0.0f);
-
- ray->P += lensuvw;
+ ray->P = Pcamera + lensuvw;
ray->D = normalize(Pfocus - lensuvw);
}
-
+ else {
+ ray->P = Pcamera;
+ }
/* transform ray from camera to world */
Transform cameratoworld = kernel_data.cam.cameratoworld;
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_color.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_color.h 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_color.h 2013-04-06 13:24:34 UTC (rev 55841)
@@ -48,6 +48,14 @@
color_scene_linear_to_srgb(c[2]));
}
+color color_unpremultiply(color c, float alpha)
+{
+ if(alpha != 1.0 && alpha != 0.0)
+ return c/alpha;
+
+ return c;
+}
+
/* Color Operations */
color rgb_to_hsv(color rgb)
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_environment_texture.osl
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_environment_texture.osl 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_environment_texture.osl 2013-04-06 13:24:34 UTC (rev 55841)
@@ -66,6 +66,9 @@
/* todo: use environment for better texture filtering of equirectangular */
Color = (color)texture(filename, p[0], 1.0 - p[1], "wrap", "periodic", "alpha", Alpha);
+ if (isconnected(Alpha))
+ Color = color_unpremultiply(Color, Alpha);
+
if (color_space == "sRGB")
Color = color_srgb_to_scene_linear(Color);
}
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_image_texture.osl
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_image_texture.osl 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_image_texture.osl 2013-04-06 13:24:34 UTC (rev 55841)
@@ -19,10 +19,13 @@
#include "stdosl.h"
#include "node_color.h"
-color image_texture_lookup(string filename, string color_space, float u, float v, output float Alpha)
+color image_texture_lookup(string filename, string color_space, float u, float v, output float Alpha, int use_alpha)
{
color rgb = (color)texture(filename, u, 1.0 - v, "wrap", "periodic", "alpha", Alpha);
+ if (use_alpha)
+ rgb = color_unpremultiply(rgb, Alpha);
+
if (color_space == "sRGB")
rgb = color_srgb_to_scene_linear(rgb);
@@ -44,9 +47,11 @@
if (use_mapping)
p = transform(mapping, p);
+
+ int use_alpha = isconnected(Alpha);
if (projection == "Flat") {
- Color = image_texture_lookup(filename, color_space, p[0], p[1], Alpha);
+ Color = image_texture_lookup(filename, color_space, p[0], p[1], Alpha, use_alpha);
}
else if (projection == "Box") {
/* object space normal */
@@ -111,15 +116,15 @@
float tmp_alpha;
if (weight[0] > 0.0) {
- Color += weight[0] * image_texture_lookup(filename, color_space, p[1], p[2], tmp_alpha);
+ Color += weight[0] * image_texture_lookup(filename, color_space, p[1], p[2], tmp_alpha, use_alpha);
Alpha += weight[0] * tmp_alpha;
}
if (weight[1] > 0.0) {
- Color += weight[1] * image_texture_lookup(filename, color_space, p[0], p[2], tmp_alpha);
+ Color += weight[1] * image_texture_lookup(filename, color_space, p[0], p[2], tmp_alpha, use_alpha);
Alpha += weight[1] * tmp_alpha;
}
if (weight[2] > 0.0) {
- Color += weight[2] * image_texture_lookup(filename, color_space, p[1], p[0], tmp_alpha);
+ Color += weight[2] * image_texture_lookup(filename, color_space, p[1], p[0], tmp_alpha, use_alpha);
Alpha += weight[2] * tmp_alpha;
}
}
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h 2013-04-06 13:24:34 UTC (rev 55841)
@@ -50,7 +50,7 @@
return x - (float)i;
}
-__device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint srgb)
+__device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint srgb, uint use_alpha)
{
/* first slots are used by float textures, which are not supported here */
if(id < TEX_NUM_FLOAT_IMAGES)
@@ -88,6 +88,13 @@
r += ty*(1.0f - tx)*svm_image_texture_read(kg, offset + ix + niy*width);
r += ty*tx*svm_image_texture_read(kg, offset + nix + niy*width);
+ if(use_alpha && r.w != 1.0f && r.w != 0.0f) {
+ float invw = 1.0f/r.w;
+ r.x *= invw;
+ r.y *= invw;
+ r.z *= invw;
+ }
+
if(srgb) {
r.x = color_srgb_to_scene_linear(r.x);
r.y = color_srgb_to_scene_linear(r.y);
@@ -99,7 +106,7 @@
#else
-__device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint srgb)
+__device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint srgb, uint use_alpha)
{
float4 r;
@@ -222,6 +229,13 @@
}
#endif
+ if(use_alpha && r.w != 1.0f && r.w != 0.0f) {
+ float invw = 1.0f/r.w;
+ r.x *= invw;
+ r.y *= invw;
+ r.z *= invw;
+ }
+
if(srgb) {
r.x = color_srgb_to_scene_linear(r.x);
r.y = color_srgb_to_scene_linear(r.y);
@@ -241,7 +255,8 @@
decode_node_uchar4(node.z, &co_offset, &out_offset, &alpha_offset, &srgb);
float3 co = stack_load_float3(stack, co_offset);
- float4 f = svm_image_texture(kg, id, co.x, co.y, srgb);
+ uint use_alpha = stack_valid(alpha_offset);
+ float4 f = svm_image_texture(kg, id, co.x, co.y, srgb, use_alpha);
if(stack_valid(out_offset))
stack_store_float3(stack, out_offset, make_float3(f.x, f.y, f.z));
@@ -322,13 +337,14 @@
uint id = node.y;
float4 f = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+ uint use_alpha = stack_valid(alpha_offset);
if(weight.x > 0.0f)
- f += weight.x*svm_image_texture(kg, id, co.y, co.z, srgb);
+ f += weight.x*svm_image_texture(kg, id, co.y, co.z, srgb, use_alpha);
if(weight.y > 0.0f)
- f += weight.y*svm_image_texture(kg, id, co.x, co.z, srgb);
+ f += weight.y*svm_image_texture(kg, id, co.x, co.z, srgb, use_alpha);
if(weight.z > 0.0f)
- f += weight.z*svm_image_texture(kg, id, co.y, co.x, srgb);
+ f += weight.z*svm_image_texture(kg, id, co.y, co.x, srgb, use_alpha);
if(stack_valid(out_offset))
stack_store_float3(stack, out_offset, make_float3(f.x, f.y, f.z));
@@ -355,7 +371,8 @@
else
uv = direction_to_mirrorball(co);
- float4 f = svm_image_texture(kg, id, uv.x, uv.y, srgb);
+ uint use_alpha = stack_valid(alpha_offset);
+ float4 f = svm_image_texture(kg, id, uv.x, uv.y, srgb, use_alpha);
if(stack_valid(out_offset))
stack_store_float3(stack, out_offset, make_float3(f.x, f.y, f.z));
Modified: branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp 2013-04-06 12:07:42 UTC (rev 55840)
+++ branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp 2013-04-06 13:24:34 UTC (rev 55841)
@@ -72,20 +72,33 @@
size_t Attribute::element_size(int numverts, int numtris, int numcurves, int numkeys) const
{
- if(element == ATTR_ELEMENT_VALUE)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list