[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59073] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sun Aug 11 21:47:43 CEST 2013
Revision: 59073
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59073
Author: gdh
Date: 2013-08-11 19:47:43 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59040 to r59072.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59040
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59072
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_curve.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2013-cycles_mblur/intern/cycles/render/curves.cpp
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi.c
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/screen.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_time/space_time.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/occlusion.c
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2013-cycles_mblur/source/tools/check_style_c.py
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59039
+ /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,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59072
Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-08-11 16:55:24 UTC (rev 59072)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-08-11 19:47:43 UTC (rev 59073)
@@ -237,6 +237,7 @@
# Version??
OPENCOLLADA_VERSION="1.3"
OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
+OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -1632,7 +1633,7 @@
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=6
+ opencollada_magic=7
_init_opencollada
# Clean install if needed!
@@ -1657,7 +1658,7 @@
git pull origin master
# Stick to same rev as windows' libs...
- git checkout e886e196673222f2f4bc32b936dc96419fff815f
+ git checkout $OPENCOLLADA_REPO_UID
git reset --hard
# Always refresh the whole build!
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-11 16:55:24 UTC (rev 59072)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-11 19:47:43 UTC (rev 59073)
@@ -52,6 +52,7 @@
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -59,7 +60,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h 2013-08-11 16:55:24 UTC (rev 59072)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h 2013-08-11 19:47:43 UTC (rev 59073)
@@ -215,12 +215,12 @@
float3 P, float3 idir, uint visibility, int object, int curveAddr, int segment, uint *lcg_state, float difl, float extmax)
{
float epsilon = 0.0f;
- int depth = kernel_data.curve_kernel_data.subdivisions;
+ int depth = kernel_data.curve.subdivisions;
/* curve Intersection check */
float3 dir = 1.0f/idir;
- int flags = kernel_data.curve_kernel_data.curveflags;
+ int flags = kernel_data.curve.curveflags;
int prim = kernel_tex_fetch(__prim_index, curveAddr);
@@ -525,7 +525,7 @@
float3 P, float3 idir, uint visibility, int object, int curveAddr, int segment, uint *lcg_state, float difl, float extmax)
{
/* curve Intersection check */
- int flags = kernel_data.curve_kernel_data.curveflags;
+ int flags = kernel_data.curve.curveflags;
int prim = kernel_tex_fetch(__prim_index, curveAddr);
float4 v00 = kernel_tex_fetch(__curves, prim);
@@ -649,7 +649,7 @@
if (flags & CURVE_KN_ENCLOSEFILTER) {
- float enc_ratio = kernel_data.curve_kernel_data.encasing_ratio;
+ float enc_ratio = kernel_data.curve.encasing_ratio;
if((dot(P - p1, tg) > -r1 * enc_ratio) && (dot(P - p2, tg) < r2 * enc_ratio)) {
float a2 = 1.0f - (dirz*dirz*(1 + gd*gd*enc_ratio*enc_ratio));
float c2 = dot(dif,dif) - difz * difz * (1 + gd*gd*enc_ratio*enc_ratio) - r1*r1*enc_ratio*enc_ratio - 2*r1*difz*gd*enc_ratio;
@@ -1009,7 +1009,7 @@
__device_inline float3 bvh_curve_refine(KernelGlobals *kg, ShaderData *sd, const Intersection *isect, const Ray *ray, float t)
{
- int flag = kernel_data.curve_kernel_data.curveflags;
+ int flag = kernel_data.curve.curveflags;
float3 P = ray->P;
float3 D = ray->D;
@@ -1062,7 +1062,7 @@
sd->v = 0.0f;
#endif
- if(kernel_data.curve_kernel_data.curveflags & CURVE_KN_RIBBONS)
+ if(kernel_data.curve.curveflags & CURVE_KN_RIBBONS)
sd->Ng = normalize(-(D - tg * (dot(tg,D))));
else {
sd->Ng = normalize(P - p_curr);
@@ -1080,7 +1080,7 @@
#endif
if (flag & CURVE_KN_TRUETANGENTGNORMAL) {
- sd->Ng = -(D - tg * (dot(tg,D) * kernel_data.curve_kernel_data.normalmix));
+ sd->Ng = -(D - tg * (dot(tg,D) * kernel_data.curve.normalmix));
sd->Ng = normalize(sd->Ng);
if (flag & CURVE_KN_NORMALCORRECTION) {
sd->Ng = sd->Ng - gd * tg;
@@ -1098,7 +1098,7 @@
sd->N = sd->Ng;
if (flag & CURVE_KN_TANGENTGNORMAL && !(flag & CURVE_KN_TRUETANGENTGNORMAL)) {
- sd->N = -(D - tg * (dot(tg,D) * kernel_data.curve_kernel_data.normalmix));
+ sd->N = -(D - tg * (dot(tg,D) * kernel_data.curve.normalmix));
sd->N = normalize(sd->N);
if (flag & CURVE_KN_NORMALCORRECTION) {
sd->N = sd->N - gd * tg;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_traversal.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_traversal.h 2013-08-11 16:55:24 UTC (rev 59072)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_traversal.h 2013-08-11 19:47:43 UTC (rev 59073)
@@ -258,7 +258,7 @@
#if !FEATURE(BVH_SUBSURFACE)
if(segment != ~0) {
- if(kernel_data.curve_kernel_data.curveflags & CURVE_KN_INTERPOLATE)
+ if(kernel_data.curve.curveflags & CURVE_KN_INTERPOLATE)
#if FEATURE(BVH_HAIR_MINIMUM_WIDTH)
hit = bvh_cardinal_curve_intersect(kg, isect, P, idir, visibility, object, primAddr, segment, lcg_state, difl, extmax);
else
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_curve.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_curve.h 2013-08-11 16:55:24 UTC (rev 59072)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_curve.h 2013-08-11 19:47:43 UTC (rev 59073)
@@ -120,14 +120,14 @@
float3 tgN = make_float3(0.0f,0.0f,0.0f);
if(sd->segment != ~0) {
- float normalmix = kernel_data.curve_kernel_data.normalmix;
+ float normalmix = kernel_data.curve.normalmix;
tgN = -(-sd->I - sd->dPdu * (dot(sd->dPdu,-sd->I) * normalmix / len_squared(sd->dPdu)));
tgN = normalize(tgN);
/* need to find suitable scaled gd for corrected normal */
#if 0
- if (kernel_data.curve_kernel_data.use_tangent_normal_correction)
+ if (kernel_data.curve.use_tangent_normal_correction)
tgN = normalize(tgN - gd * sd->dPdu);
#endif
}
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h 2013-08-11 16:55:24 UTC (rev 59072)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h 2013-08-11 19:47:43 UTC (rev 59073)
@@ -271,10 +271,10 @@
if((kernel_data.cam.resolution == 1) && (state.flag & PATH_RAY_CAMERA)) {
float3 pixdiff = ray.dD.dx + ray.dD.dy;
/*pixdiff = pixdiff - dot(pixdiff, ray.D)*ray.D;*/
- difl = kernel_data.curve_kernel_data.minimum_width * len(pixdiff) * 0.5f;
+ difl = kernel_data.curve.minimum_width * len(pixdiff) * 0.5f;
}
- extmax = kernel_data.curve_kernel_data.maximum_width;
+ extmax = kernel_data.curve.maximum_width;
lcg_state = lcg_init(*rng + rng_offset + sample*0x51633e2d);
}
@@ -990,10 +990,10 @@
if((kernel_data.cam.resolution == 1) && (state.flag & PATH_RAY_CAMERA)) {
float3 pixdiff = ray.dD.dx + ray.dD.dy;
/*pixdiff = pixdiff - dot(pixdiff, ray.D)*ray.D;*/
- difl = kernel_data.curve_kernel_data.minimum_width * len(pixdiff) * 0.5f;
+ difl = kernel_data.curve.minimum_width * len(pixdiff) * 0.5f;
}
- extmax = kernel_data.curve_kernel_data.maximum_width;
+ extmax = kernel_data.curve.maximum_width;
lcg_state = lcg_init(*rng + rng_offset + sample*0x51633e2d);
}
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list