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

Thomas Dinges blender at dingto.org
Sun Aug 25 14:23:22 CEST 2013


Revision: 59491
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59491
Author:   dingto
Date:     2013-08-25 12:23:22 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
Merged revision(s) 59438-59490 from trunk/blender into soc-2013-dingto.

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/CMakeLists.txt
    branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
    branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
    branches/soc-2013-dingto/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_subsurface.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-dingto/intern/cycles/render/osl.cpp
    branches/soc-2013-dingto/intern/guardedalloc/CMakeLists.txt
    branches/soc-2013-dingto/release/datafiles/prvicons.png
    branches/soc-2013-dingto/release/datafiles/prvicons.svg
    branches/soc-2013-dingto/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_constraint.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_outliner.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2013-dingto/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/cloth.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/collision.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/object_deform.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-dingto/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h
    branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/edgehash.c
    branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/soc-2013-dingto/source/blender/collada/collada.cpp
    branches/soc-2013-dingto/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2013-dingto/source/blender/editors/armature/reeb.c
    branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
    branches/soc-2013-dingto/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2013-dingto/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2013-dingto/source/blender/editors/interface/view2d_ops.c
    branches/soc-2013-dingto/source/blender/editors/io/io_collada.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-dingto/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2013-dingto/source/blender/editors/space_file/space_file.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_add.c
    branches/soc-2013-dingto/source/blender/editors/space_node/node_relationships.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-dingto/source/blender/freestyle/intern/application/Controller.cpp
    branches/soc-2013-dingto/source/blender/freestyle/intern/application/Controller.h
    branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/BBox.h
    branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
    branches/soc-2013-dingto/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2013-dingto/source/blender/makesdna/DNA_space_types.h
    branches/soc-2013-dingto/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-dingto/source/blender/render/intern/source/rayshade.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c

Added Paths:
-----------
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_treehash.h
    branches/soc-2013-dingto/source/blender/blenkernel/intern/treehash.c

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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59437
   + /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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59490

Modified: branches/soc-2013-dingto/intern/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/intern/CMakeLists.txt	2013-08-25 12:17:46 UTC (rev 59490)
+++ branches/soc-2013-dingto/intern/CMakeLists.txt	2013-08-25 12:23:22 UTC (rev 59491)
@@ -23,10 +23,10 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+# add_subdirectory(atomic)  # header only
 add_subdirectory(string)
 add_subdirectory(ghost)
 add_subdirectory(guardedalloc)
-add_subdirectory(moto)
 add_subdirectory(memutil)
 add_subdirectory(opencolorio)
 add_subdirectory(opennl)
@@ -61,6 +61,10 @@
 	add_subdirectory(itasc)
 endif()
 
+if(WITH_IK_SOLVER OR WITH_GAMEENGINE)
+	add_subdirectory(moto)
+endif()
+
 if(WITH_CYCLES)
 	add_subdirectory(cycles)
 endif()

Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py	2013-08-25 12:17:46 UTC (rev 59490)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py	2013-08-25 12:23:22 UTC (rev 59491)
@@ -252,8 +252,8 @@
         col = split.column(align=True)
 
         col.label(text="Threads:")
-        col.row().prop(rd, "threads_mode", expand=True)
-        sub = col.column()
+        col.row(align=True).prop(rd, "threads_mode", expand=True)
+        sub = col.column(align=True)
         sub.enabled = rd.threads_mode == 'FIXED'
         sub.prop(rd, "threads")
 
@@ -266,7 +266,7 @@
 
         sub.prop(cscene, "use_progressive_refine")
 
-        subsub = sub.column()
+        subsub = sub.column(align=True)
         subsub.enabled = not rd.use_border
         subsub.prop(rd, "use_save_buffers")
 

Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp	2013-08-25 12:17:46 UTC (rev 59490)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp	2013-08-25 12:23:22 UTC (rev 59491)
@@ -189,7 +189,7 @@
 	}
 #endif
 
-	integrator->method = (Integrator::Method)get_int(cscene, "progressive");
+	integrator->method = (Integrator::Method)get_enum(cscene, "progressive");
 
 	int diffuse_samples = get_int(cscene, "diffuse_samples");
 	int glossy_samples = get_int(cscene, "glossy_samples");
@@ -420,7 +420,7 @@
 		preview_samples = preview_samples * preview_samples;
 	}
 
-	if(get_int(cscene, "progressive") == 0) {
+	if(get_enum(cscene, "progressive") == 0) {
 		if(background) {
 			params.samples = aa_samples;
 		}

Modified: branches/soc-2013-dingto/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/CMakeLists.txt	2013-08-25 12:17:46 UTC (rev 59490)
+++ branches/soc-2013-dingto/intern/cycles/kernel/CMakeLists.txt	2013-08-25 12:23:22 UTC (rev 59491)
@@ -22,6 +22,7 @@
 	kernel.h
 	kernel_accumulate.h
 	kernel_bvh.h
+	kernel_bvh_subsurface.h
 	kernel_bvh_traversal.h
 	kernel_camera.h
 	kernel_compat_cpu.h

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_jitter.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_jitter.h	2013-08-25 12:17:46 UTC (rev 59490)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_jitter.h	2013-08-25 12:23:22 UTC (rev 59491)
@@ -137,6 +137,8 @@
 #ifdef __CMJ__
 __device float cmj_sample_1D(int s, int N, int p)
 {
+	kernel_assert(s < N);
+
 	uint x = cmj_permute(s, N, p * 0x68bc21eb);
 	float jx = cmj_randfloat(s, p * 0x967a889b);
 
@@ -146,6 +148,8 @@
 
 __device void cmj_sample_2D(int s, int N, int p, float *fx, float *fy)
 {
+	kernel_assert(s < N);
+
 	int m = float_to_int(sqrtf(N));
 	int n = (N + m - 1)/m;
 	float invN = 1.0f/N;

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h	2013-08-25 12:17:46 UTC (rev 59490)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h	2013-08-25 12:23:22 UTC (rev 59491)
@@ -231,52 +231,24 @@
 	return result;
 }
 
-__device float4 kernel_path_integrator(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
-{
-	/* initialize */
-	PathRadiance L;
-	float3 throughput = make_float3(1.0f, 1.0f, 1.0f);
-	float L_transparent = 0.0f;
 
-	path_radiance_init(&L, kernel_data.film.use_light_pass);
+#if defined(__BRANCHED_PATH__) || defined(__BSSRDF__)
 
-	float min_ray_pdf = FLT_MAX;
-	float ray_pdf = 0.0f;
+__device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer,
+	float3 throughput, int num_samples, int num_total_samples,
+	float min_ray_pdf, float ray_pdf, PathState state, int rng_offset, PathRadiance *L)
+{
 #ifdef __LAMP_MIS__
 	float ray_t = 0.0f;
 #endif
-	PathState state;
-	int rng_offset = PRNG_BASE_NUM;
-#ifdef __CMJ__
-	int num_samples = kernel_data.integrator.aa_samples;
-#else
-	int num_samples = 0;
-#endif
 
-	path_state_init(&state);
-
 	/* path iteration */
 	for(;; rng_offset += PRNG_BOUNCE_NUM) {
 		/* intersect scene */
 		Intersection isect;
 		uint visibility = path_state_ray_visibility(kg, &state);
-
 #ifdef __HAIR__
-		float difl = 0.0f, extmax = 0.0f;
-		uint lcg_state = 0;
-
-		if(kernel_data.bvh.have_curves) {
-			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.minimum_width * len(pixdiff) * 0.5f;
-			}
-
-			extmax = kernel_data.curve.maximum_width;
-			lcg_state = lcg_init(*rng + rng_offset + sample*0x51633e2d);
-		}
-
-		bool hit = scene_intersect(kg, &ray, visibility, &isect, &lcg_state, difl, extmax);
+		bool hit = scene_intersect(kg, &ray, visibility, &isect, NULL, 0.0f, 0.0f);
 #else
 		bool hit = scene_intersect(kg, &ray, visibility, &isect);
 #endif
@@ -295,29 +267,19 @@
 			light_ray.dP = ray.dP;
 
 			/* intersect with lamp */
-			float light_t = path_rng_1D(kg, rng, sample, num_samples, rng_offset + PRNG_LIGHT);
+			float light_t = path_rng_1D(kg, rng, sample, num_total_samples, rng_offset + PRNG_LIGHT);
 			float3 emission;
 
 			if(indirect_lamp_emission(kg, &light_ray, state.flag, ray_pdf, light_t, &emission, state.bounce))
-				path_radiance_accum_emission(&L, throughput, emission, state.bounce);
+				path_radiance_accum_emission(L, throughput, emission, state.bounce);
 		}
 #endif
 
 		if(!hit) {
-			/* eval background shader if nothing hit */
-			if(kernel_data.background.transparent && (state.flag & PATH_RAY_CAMERA)) {
-				L_transparent += average(throughput);
-
-#ifdef __PASSES__
-				if(!(kernel_data.film.pass_flag & PASS_BACKGROUND))
-#endif
-					break;
-			}
-
 #ifdef __BACKGROUND__
 			/* sample background shader */
 			float3 L_background = indirect_background(kg, &ray, state.flag, ray_pdf, state.bounce);
-			path_radiance_accum_background(&L, throughput, L_background, state.bounce);
+			path_radiance_accum_background(L, throughput, L_background, state.bounce);
 #endif
 
 			break;
@@ -326,32 +288,10 @@
 		/* setup shading */
 		ShaderData sd;
 		shader_setup_from_ray(kg, &sd, &isect, &ray, state.bounce);
-		float rbsdf = path_rng_1D(kg, rng, sample, num_samples, rng_offset + PRNG_BSDF);
-		shader_eval_surface(kg, &sd, rbsdf, state.flag, SHADER_CONTEXT_MAIN);
+		float rbsdf = path_rng_1D(kg, rng, sample, num_total_samples, rng_offset + PRNG_BSDF);
+		shader_eval_surface(kg, &sd, rbsdf, state.flag, SHADER_CONTEXT_INDIRECT);
+		shader_merge_closures(kg, &sd);
 
-		/* holdout */
-#ifdef __HOLDOUT__
-		if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) && (state.flag & PATH_RAY_CAMERA)) {
-			if(kernel_data.background.transparent) {
-				float3 holdout_weight;
-				
-				if(sd.flag & SD_HOLDOUT_MASK)
-					holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
-				else
-					holdout_weight = shader_holdout_eval(kg, &sd);
-
-				/* any throughput is ok, should all be identical here */
-				L_transparent += average(holdout_weight*throughput);
-			}
-

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list