Revision: 58987
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58987
Author: gdh
Date: 2013-08-07 05:54:02 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58971 to r58984.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58971
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58984
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
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/mikktspace/mikktspace.c
branches/soc-2013-cycles_mblur/source/blender/blenfont/BLF_api.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/multires.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/voronoi.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/pose_transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_file/space_file.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/bake.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/occlusion.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pointdensity.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/rayshade.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/render_texture.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/strand.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/zbuf.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_MeshProxy.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-58970
+ /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-58984
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
2013-08-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
2013-08-07 05:54:02 UTC (rev 58987)
@@ -44,11 +44,11 @@
#define BSSRDF_MIN_RADIUS 1e-8f
#define BSSRDF_MAX_ATTEMPTS 8
-#define BB_DRAPPER 800.0
-#define BB_MAX_TABLE_RANGE 12000.0
-#define BB_TABLE_XPOWER 1.5
-#define BB_TABLE_YPOWER 5.0
-#define BB_TABLE_SPACING 2.0
+#define BB_DRAPPER 800.0f
+#define BB_MAX_TABLE_RANGE 12000.0f
+#define BB_TABLE_XPOWER 1.5f
+#define BB_TABLE_YPOWER 5.0f
+#define BB_TABLE_SPACING 2.0f
#define TEX_NUM_FLOAT_IMAGES 5
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-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_blackbody.h
2013-08-07 05:54:02 UTC (rev 58987)
@@ -42,18 +42,18 @@
/* Input */
float temperature = stack_load_float(stack, temperature_offset);
- if (temperature < (float)BB_DRAPPER) {
+ if (temperature < BB_DRAPPER) {
/* just return very very dim red */
color_rgb = make_float3(1.0e-6f,0.0f,0.0f);
}
- else if (temperature <= (float)BB_MAX_TABLE_RANGE) {
+ else if (temperature <= 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 - (float)BB_DRAPPER) * (float)(1.0
/ BB_TABLE_SPACING), (float)(1.0 / BB_TABLE_XPOWER));
+ float t = powf((temperature - BB_DRAPPER) * (1.0f /
BB_TABLE_SPACING), (1.0f / 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-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/blackbody.cpp
2013-08-07 05:54:02 UTC (rev 58987)
@@ -100,7 +100,7 @@
/* ToDo: bring this back to what OSL does with the lastTemperature
limit ? */
for (int i = 0; i <= 317; ++i) {
- double Temperature = pow((double)i, BB_TABLE_XPOWER) *
BB_TABLE_SPACING + BB_DRAPPER;
+ double Temperature = pow((double)i, (double)BB_TABLE_XPOWER) *
(double)BB_TABLE_SPACING + (double)BB_DRAPPER;
X = 0;
Y = 0;
Z = 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.0 / BB_TABLE_YPOWER);
- col.y = powf(col.y, 1.0 / BB_TABLE_YPOWER);
- col.z = powf(col.z, 1.0 / BB_TABLE_YPOWER);
+ 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);
/* Store in table in RRRGGGBBB format */
blackbody_table[i] = col.x;
Modified: branches/soc-2013-cycles_mblur/intern/mikktspace/mikktspace.c
===================================================================
--- branches/soc-2013-cycles_mblur/intern/mikktspace/mikktspace.c
2013-08-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/intern/mikktspace/mikktspace.c
2013-08-07 05:54:02 UTC (rev 58987)
@@ -426,7 +426,7 @@
int index;
} STmpVert;
-const int g_iCells = 2048;
+static const int g_iCells = 2048;
#ifdef _MSC_VER
#define NOINLINE __declspec(noinline)
Modified: branches/soc-2013-cycles_mblur/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenfont/BLF_api.h
2013-08-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/source/blender/blenfont/BLF_api.h
2013-08-07 05:54:02 UTC (rev 58987)
@@ -149,11 +149,11 @@
/* Set the buffer, size and number of channels to draw, one thing to take care
is call
* this function with NULL pointer when we finish, for example:
*
- * BLF_buffer(my_fbuf, my_cbuf, 100, 100, 4, TRUE);
+ * BLF_buffer(my_fbuf, my_cbuf, 100, 100, 4, TRUE, NULL);
*
* ... set color, position and draw ...
*
- * BLF_buffer(NULL, NULL, 0, 0, 0, FALSE);
+ * BLF_buffer(NULL, NULL, NULL, 0, 0, FALSE, NULL);
*/
void BLF_buffer(int fontid, float *fbuf, unsigned char *cbuf, int w, int h,
int nch, struct ColorManagedDisplay *display);
Modified:
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
---
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
2013-08-07 05:36:15 UTC (rev 58986)
+++
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
2013-08-07 05:54:02 UTC (rev 58987)
@@ -2635,9 +2635,9 @@
/* new computation method */
{
- SGLSLMeshToTangent mesh2tangent = {0};
- SMikkTSpaceContext sContext = {0};
- SMikkTSpaceInterface sInterface = {0};
+ SGLSLMeshToTangent mesh2tangent = {NULL};
+ SMikkTSpaceContext sContext = {NULL};
+ SMikkTSpaceInterface sInterface = {NULL};
mesh2tangent.precomputedFaceNormals = nors;
mesh2tangent.mtface = mtface;
Modified:
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
---
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
2013-08-07 05:36:15 UTC (rev 58986)
+++
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
2013-08-07 05:54:02 UTC (rev 58987)
@@ -3290,7 +3290,7 @@
if (!brush->dm) return 0;
{
- BVHTreeFromMesh treeData = {0};
+ BVHTreeFromMesh treeData = {NULL};
float avg_brushNor[3] = {0.0f};
float brush_radius = brush->paint_distance *
surface->radius_scale;
int numOfVerts;
@@ -4977,7 +4977,7 @@
/* make sure we're dealing with a brush */
if (pmd2->brush) {
DynamicPaintBrushSettings *brush =
pmd2->brush;
- BrushMaterials bMats = {0};
+ BrushMaterials bMats = {NULL};
/* calculate brush speed vectors if
required */
if (surface->type ==
MOD_DPAINT_SURFACE_T_PAINT && brush->flags & MOD_DPAINT_DO_SMUDGE) {
Modified:
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
---
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
2013-08-07 05:36:15 UTC (rev 58986)
+++
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
2013-08-07 05:54:02 UTC (rev 58987)
@@ -1064,7 +1064,7 @@
const float (*vertexNos)[3];
const float (*polyNos)[3];
BMFace *efa;
- DMVertexAttribs attribs = {{{0}}};
+ DMVertexAttribs attribs = {{{NULL}}};
GPUVertexAttribs gattribs;
int i, matnr, new_matnr;
Modified:
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image_gen.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image_gen.c
2013-08-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image_gen.c
2013-08-07 05:54:02 UTC (rev 58987)
@@ -336,7 +336,7 @@
}
/* cleanup the buffer. */
- BLF_buffer(mono, NULL, NULL, 0, 0, 0, FALSE);
+ BLF_buffer(mono, NULL, NULL, 0, 0, 0, NULL);
}
void BKE_image_buf_fill_checker_color(unsigned char *rect, float *rect_float,
int width, int height)
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
2013-08-07 05:36:15 UTC (rev 58986)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/key.c
2013-08-07 05:54:02 UTC (rev 58987)
@@ -190,7 +190,8 @@
Key *keyn;
KeyBlock *kbn, *kb;
- if (key == 0) return 0;
+ if (key == NULL)
+ return NULL;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
