[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59108] branches/soc-2013-dingto: Merged revision(s) 59035-59107 from trunk/blender into soc-2013-dingto.

Thomas Dinges blender at dingto.org
Tue Aug 13 11:15:03 CEST 2013 

Revision: 59108
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59108
Author:   dingto
Date:     2013-08-13 09:15:03 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Merged revision(s) 59035-59107 from trunk/blender into soc-2013-dingto. 

Skipping 59034 (Non-Progressive on GPU). 

Modified Paths:
--------------
    branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
    branches/soc-2013-dingto/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2013-dingto/doc/python_api/rst/bge.logic.rst
    branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
    branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-dingto/intern/cycles/kernel/kernel.cpp
    branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_curve.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_passes.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse2.cpp
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_texture.h
    branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_wave_texture.osl
    branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2013-dingto/intern/cycles/render/curves.cpp
    branches/soc-2013-dingto/intern/cycles/render/graph.cpp
    branches/soc-2013-dingto/intern/cycles/render/session.cpp
    branches/soc-2013-dingto/intern/cycles/render/svm.cpp
    branches/soc-2013-dingto/intern/cycles/render/tile.cpp
    branches/soc-2013-dingto/release/scripts/modules/bpy/path.py
    branches/soc-2013-dingto/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2013-dingto/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2013-dingto/source/blender/avi/intern/avi.c
    branches/soc-2013-dingto/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_screen.h
    branches/soc-2013-dingto/source/blender/blenkernel/intern/action.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/armature.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/camera.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mask.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/screen.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-dingto/source/blender/bmesh/bmesh.h
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.h
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.h
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_split_edges.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/soc-2013-dingto/source/blender/editors/armature/pose_edit.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_draw.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-dingto/source/blender/editors/mask/mask_draw.c
    branches/soc-2013-dingto/source/blender/editors/mask/mask_ops.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-dingto/source/blender/editors/object/object_edit.c
    branches/soc-2013-dingto/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2013-dingto/source/blender/editors/space_time/space_time.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/FitCurve.cpp
    branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
    branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
    branches/soc-2013-dingto/source/blender/gpu/GPU_buffers.h
    branches/soc-2013-dingto/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2013-dingto/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-dingto/source/blender/imbuf/intern/bmp.c
    branches/soc-2013-dingto/source/blender/makesdna/DNA_image_types.h
    branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_define.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_ocean.c
    branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-dingto/source/blender/render/intern/source/occlusion.c
    branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2013-dingto/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2013-dingto/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2013-dingto/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2013-dingto/release/text/GPL3-license.txt
    branches/soc-2013-dingto/release/text/jemalloc-license.txt

Property Changed:
----------------
    branches/soc-2013-dingto/
    branches/soc-2013-dingto/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032
   + /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:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59107

Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh	2013-08-13 09:15:03 UTC (rev 59108)
@@ -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-dingto/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2013-dingto/build_files/cmake/cmake_static_check_cppcheck.py	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/build_files/cmake/cmake_static_check_cppcheck.py	2013-08-13 09:15:03 UTC (rev 59108)
@@ -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-dingto/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2013-dingto/doc/python_api/rst/bge.logic.rst	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/doc/python_api/rst/bge.logic.rst	2013-08-13 09:15:03 UTC (rev 59108)
@@ -362,9 +362,9 @@
 
    Use / as directory separator in path
    You can use '//' at the start of the string to define a relative path;
-   Blender replaces that string by the directory of the startup .blend or runtime file
-   to make a full path name (doesn't change during the game, even if you load other .blend).
-   The function also converts the directory separator to the local file system format.
+   Blender replaces that string by the directory of the current .blend or runtime file
+   to make a full path name. The function also converts the directory separator to
+   the local file system format.
 
    :arg path: The path string to be converted/expanded.
    :type path: string

Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py	2013-08-13 09:15:03 UTC (rev 59108)
@@ -353,7 +353,9 @@
         col.prop(rl, "use_pass_uv")
         col.prop(rl, "use_pass_object_index")
         col.prop(rl, "use_pass_material_index")
+        col.separator()
         col.prop(rl, "use_pass_shadow")
+        col.prop(rl, "use_pass_ambient_occlusion")
 
         col = split.column()
         col.label(text="Diffuse:")
@@ -380,7 +382,6 @@
         col.separator()
         col.prop(rl, "use_pass_emit", text="Emission")
         col.prop(rl, "use_pass_environment")
-        col.prop(rl, "use_pass_ambient_occlusion")
 
 
 class Cycles_PT_post_processing(CyclesButtonsPanel, Panel):

Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp	2013-08-13 09:15:03 UTC (rev 59108)
@@ -373,7 +373,7 @@
 	
 	if(show_emitter) {
 		hide_triangles = false;
-		return (hide_as_dupli_parent || hide_as_dupli_child_original);
+		return false;
 	}
 	else if(hair_present) {
 		hide_triangles = true;

Modified: branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp	2013-08-13 09:15:03 UTC (rev 59108)
@@ -572,8 +572,11 @@
 		/* get kernel function */
 		if(progressive)
 			cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive"))
-		else
+		else {
 			cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive"))
+			if(have_error())
+				return;
+		}
 		
 		/* pass in parameters */
 		int offset = 0;

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel.cpp	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel.cpp	2013-08-13 09:15:03 UTC (rev 59108)
@@ -90,10 +90,12 @@
 
 void kernel_cpu_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride)
 {
-	if(kernel_data.integrator.progressive)
+#ifdef __NON_PROGRESSIVE__
+	if(!kernel_data.integrator.progressive)
+		kernel_path_trace_non_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
+	else
+#endif
 		kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
-	else
-		kernel_path_trace_non_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
 }
 
 /* Tonemapping */

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu	2013-08-13 09:15:03 UTC (rev 59108)
@@ -35,6 +35,7 @@
 		kernel_path_trace_progressive(NULL, buffer, rng_state, sample, x, y, offset, stride);
 }
 
+#ifdef __NON_PROGRESSIVE__
 extern "C" __global__ void kernel_cuda_path_trace_non_progressive(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride)
 {
 	int x = sx + blockDim.x*blockIdx.x + threadIdx.x;
@@ -43,6 +44,7 @@
 	if(x < sx + sw && y < sy + sh)
 		kernel_path_trace_non_progressive(NULL, buffer, rng_state, sample, x, y, offset, stride);
 }
+#endif
 
 extern "C" __global__ void kernel_cuda_tonemap(uchar4 *rgba, float *buffer, int sample, int sx, int sy, int sw, int sh, int offset, int stride)
 {

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh.h	2013-08-13 08:43:31 UTC (rev 59107)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_bvh.h	2013-08-13 09:15:03 UTC (rev 59108)
@@ -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) {
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list