[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58971] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Tue Aug 6 21:02:29 CEST 2013


Revision: 58971
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58971
Author:   gdh
Date:     2013-08-06 19:02:29 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58946 to r58970.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58946
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58970

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_blackbody.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.cpp
    branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp
    branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_mjpeg.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_hook.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_add.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/SConscript
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/SConscript
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/envmap.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_Application.cpp

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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58945
   + /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58970

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_blackbody.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_blackbody.h	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_blackbody.h	2013-08-06 19:02:29 UTC (rev 58971)
@@ -42,18 +42,18 @@
 	/* Input */
 	float temperature = stack_load_float(stack, temperature_offset);
 
-	if (temperature < BB_DRAPPER) {
+	if (temperature < (float)BB_DRAPPER) {
 		/* just return very very dim red */
 		color_rgb = make_float3(1.0e-6f,0.0f,0.0f);
 	}
-	else if (temperature <= BB_MAX_TABLE_RANGE) {
+	else if (temperature <= (float)BB_MAX_TABLE_RANGE) {
 		/* This is the overall size of the table */
 		const int lookuptablesize = 956;
 		const float lookuptablenormalize = 1.0f/956.0f;
 
 		/* reconstruct a proper index for the table lookup, compared to OSL we don't look up two colors
 		just one (the OSL-lerp is also automatically done for us by "lookup_table_read") */
-		float t = powf((temperature - BB_DRAPPER) * (1.0f / BB_TABLE_SPACING), 1.0f/BB_TABLE_XPOWER);
+		float t = powf((temperature - (float)BB_DRAPPER) * (float)(1.0 / BB_TABLE_SPACING), (float)(1.0 / BB_TABLE_XPOWER));
 
 		int blackbody_table_offset = kernel_data.blackbody.table_offset;
 

Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.cpp	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.cpp	2013-08-06 19:02:29 UTC (rev 58971)
@@ -91,7 +91,7 @@
 	const double c1 = 3.74183e-16; // 2*pi*h*c^2, W*m^2
 	const double c2 = 1.4388e-2;   // h*c/k, m*K
 								   // h is Planck's const, k is Boltzmann's
-	const float dlambda = 5.0f * 1e-9;  // in meters
+	const float dlambda = 5.0f * 1e-9f;  // in meters
 
 	/* Blackbody table from 800 to 12k Kelvin (319 entries (317+2 offset) * 3) */
 	vector<float> blackbody_table(956);
@@ -100,7 +100,7 @@
 
 	/* ToDo: bring this back to what OSL does with the lastTemperature limit ? */
 	for (int i = 0;  i <= 317;  ++i) {
-		float Temperature = powf (float(i), BB_TABLE_XPOWER) * BB_TABLE_SPACING + BB_DRAPPER;
+		double Temperature = pow((double)i, BB_TABLE_XPOWER) * BB_TABLE_SPACING + BB_DRAPPER;
 		X = 0;
 		Y = 0;
 		Z = 0;
@@ -108,10 +108,10 @@
 		/* from OSL "spectrum_to_XYZ" */
 		for (int n = 0; n < 81; ++n) {
 			float lambda = 380.0f + 5.0f * n;
-			double wlm = lambda * 1e-9;   // Wavelength in meters
+			double wlm = lambda * 1e-9f;   // Wavelength in meters
 			// N.B. spec_intens returns result in W/m^2 but it's a differential,
 			// needs to be scaled by dlambda!
-			float spec_intens = float((c1 * powf(wlm,-5.0)) / (expf(c2 / (wlm * Temperature)) -1.0f));
+			float spec_intens = float((c1 * pow(wlm, -5.0)) / (exp(c2 / (wlm * Temperature)) -1.0));
 			float Me = spec_intens * dlambda;
 
 			X += Me * cie_colour_match[n][0];
@@ -125,9 +125,9 @@
 		/* Clamp to zero if values are smaller */
 		col = max(col, make_float3(0.0f, 0.0f, 0.0f));
 
-		col.x = powf(col.x, 1.0f / BB_TABLE_YPOWER);
-		col.y = powf(col.y, 1.0f / BB_TABLE_YPOWER);
-		col.z = powf(col.z, 1.0f / BB_TABLE_YPOWER);
+		col.x = powf(col.x, 1.0 / BB_TABLE_YPOWER);
+		col.y = powf(col.y, 1.0 / BB_TABLE_YPOWER);
+		col.z = powf(col.z, 1.0 / BB_TABLE_YPOWER);
 
 		/* Store in table in RRRGGGBBB format */
 		blackbody_table[i] = col.x;

Modified: branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/intern/dualcon/intern/octree.cpp	2013-08-06 19:02:29 UTC (rev 58971)
@@ -2182,7 +2182,7 @@
 			ata[4] += (float)(norm[1] * norm[2]);
 			ata[5] += (float)(norm[2] * norm[2]);
 
-			double pn = p[0] * norm[0] + p[1] * norm[1] + p[2] * norm[2];
+			const float pn = p[0] * norm[0] + p[1] * norm[1] + p[2] * norm[2];
 
 			atb[0] += (float)(norm[0] * pn);
 			atb[1] += (float)(norm[1] * pn);

Modified: branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils_spell_check.py	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils_spell_check.py	2013-08-06 19:02:29 UTC (rev 58971)
@@ -72,6 +72,7 @@
         "bandnoise",
         "bindcode",
         "bitrate",
+        "blackbody",
         "blendfile",
         "blendin",
         "bonesize",
@@ -361,6 +362,7 @@
         "timecode",
         "voronoi",
         "voxel", "voxels",
+        "vsync",
         "wireframe",
         "zmask",
         "ztransp",

Modified: branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_mjpeg.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_mjpeg.c	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_mjpeg.c	2013-08-06 19:02:29 UTC (rev 58971)
@@ -44,8 +44,6 @@
 
 #include "avi_mjpeg.h"
 
-#define PADUP(num, amt) ((num + (amt - 1)) & ~(amt - 1))
-
 static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, int bufsize);
 static void jpegmemsrcmgr_build(j_decompress_ptr dinfo, unsigned char *buffer, int bufsize);
 

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c	2013-08-06 19:02:29 UTC (rev 58971)
@@ -1227,7 +1227,7 @@
 				
 				copy_v3_v3(totmat[3], vec);
 				
-				mul_serie_m4(ct->matrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL);
+				mul_m4_m4m4(ct->matrix, ct->tar->obmat, totmat);
 			}
 		}
 	}
@@ -1253,7 +1253,7 @@
 		mat4_to_size(size, cob->matrix);
 		
 		/* apply targetmat - containing location on path, and rotation */
-		mul_serie_m4(cob->matrix, ct->matrix, obmat, NULL, NULL, NULL, NULL, NULL, NULL);
+		mul_m4_m4m4(cob->matrix, ct->matrix, obmat);
 		
 		/* un-apply scaling caused by path */
 		if ((data->followflag & FOLLOWPATH_RADIUS) == 0) { /* XXX - assume that scale correction means that radius will have some scale error in it - Campbell */
@@ -3122,7 +3122,7 @@
 				unit_m4(totmat);
 				copy_v3_v3(totmat[3], vec);
 				
-				mul_serie_m4(targetMatrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL);
+				mul_m4_m4m4(targetMatrix, ct->tar->obmat, totmat);
 			}
 		}
 		

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c	2013-08-06 17:45:58 UTC (rev 58970)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c	2013-08-06 19:02:29 UTC (rev 58971)
@@ -2038,15 +2038,13 @@
 				}
 			}
 			
-			if (ok) mul_serie_m4(totmat, par->obmat, tmat,
-				                 NULL, NULL, NULL, NULL, NULL, NULL);
+			if (ok) mul_m4_m4m4(totmat, par->obmat, tmat);
 			else copy_m4_m4(totmat, par->obmat);
 			
 			break;
 		case PARBONE:
 			ob_parbone(ob, par, tmat);
-			mul_serie_m4(totmat, par->obmat, tmat,
-			             NULL, NULL, NULL, NULL, NULL, NULL);
+			mul_m4_m4m4(totmat, par->obmat, tmat);
 			break;
 		
 		case PARVERT1:
@@ -2062,8 +2060,7 @@
 		case PARVERT3:
 			ob_parvert3(ob, par, tmat);
 			
-			mul_serie_m4(totmat, par->obmat, tmat,
-			             NULL, NULL, NULL, NULL, NULL, NULL);
+			mul_m4_m4m4(totmat, par->obmat, tmat);
 			break;
 		
 		case PARSKEL:
@@ -2072,10 +2069,8 @@
 	}
 	
 	/* total */
-	mul_serie_m4(tmat, totmat, ob->parentinv,
-	             NULL, NULL, NULL, NULL, NULL, NULL);
-	mul_serie_m4(obmat, tmat, locmat,         
-	             NULL, NULL, NULL, NULL, NULL, NULL);
+	mul_m4_m4m4(tmat, totmat, ob->parentinv);
+	mul_m4_m4m4(obmat, tmat, locmat);
 	
 	if (simul) {
 


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list