[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58225] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sun Jul 14 00:55:29 CEST 2013
Revision: 58225
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58225
Author: gdh
Date: 2013-07-13 22:55:28 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58206 to r58224.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58206
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58224
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/boids.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_markers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_regions.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filelist.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_time/space_time.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/BoxGrid.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/util.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/makesdna.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/render_texture.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_playanim.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /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:57388-58205
+ /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:57388-58224
Modified: branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenfont/intern/blf_font.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -87,7 +87,7 @@
err = FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)(size * 64), dpi, dpi);
if (err) {
/* FIXME: here we can go through the fixed size and choice a close one */
- printf("The current font don't support the size, %d and dpi, %d\n", size, dpi);
+ printf("The current font don't support the size, %u and dpi, %u\n", size, dpi);
return;
}
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/boids.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/boids.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/boids.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -981,6 +981,7 @@
rule = BLI_findlink(&state->rules, rand % BLI_countlist(&state->rules));
apply_boid_rule(bbd, rule, &val, pa, -1.0);
+ break;
}
case eBoidRulesetType_Average:
{
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/brush.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -539,7 +539,7 @@
else if (mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) {
float rotation = -mtex->rot;
float point_2d[2] = {point[0], point[1]};
- float x = 0.0f, y = 0.0f; /* Quite warnings */
+ float x, y;
float co[3];
x = point_2d[0] - br->stencil_pos[0];
@@ -658,7 +658,7 @@
if (mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) {
float rotation = -mtex->rot;
float point_2d[2] = {point[0], point[1]};
- float x = 0.0f, y = 0.0f; /* Quite warnings */
+ float x, y;
float co[3];
x = point_2d[0] - br->mask_stencil_pos[0];
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/constraint.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -2519,7 +2519,7 @@
/* only evaluate if there is a target */
if (VALID_CONS_TARGET(ct)) {
- float dvec[3], dist = 0.0f, sfac = 1.0f;
+ float dvec[3], dist, sfac = 1.0f;
short clamp_surf = 0;
/* calculate our current distance from the target */
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -1697,7 +1697,7 @@
/* perform operations on the total if appropriate */
if (driver->type == DRIVER_TYPE_AVERAGE)
- driver->curval = (value / (float)tot);
+ driver->curval = tot ? (value / (float)tot) : 0.0f;
else
driver->curval = value;
}
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -2718,8 +2718,8 @@
re = RE_GetRender(iuser->scene->id.name);
channels = 4;
- layer = (iuser) ? iuser->layer : 0;
- pass = (iuser) ? iuser->pass : 0;
+ layer = iuser->layer;
+ pass = iuser->pass;
if (from_render) {
RE_AcquireResultImage(re, &rres);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lattice.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lattice.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -681,7 +681,7 @@
* we want either a Mesh with no derived data, or derived data with
* deformverts
*/
- if (target && target->type == OB_MESH) {
+ if (target->type == OB_MESH) {
/* if there's derived data without deformverts, don't use vgroups */
if (dm) {
use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/linestyle.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/linestyle.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/linestyle.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -183,7 +183,7 @@
m = (LineStyleModifier *)MEM_callocN(size, "line style modifier");
m->type = type;
- strcpy(m->name, modifier_name[type]);
+ BLI_strncpy(m->name, modifier_name[type], sizeof(m->name));
m->influence = 1.0f;
m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -530,7 +530,7 @@
if (1) {
/* now convert linknodes into arrays for faster per pixel access */
- unsigned int **buckets_face = MEM_mallocN(bucket_tot * sizeof(unsigned int **), __func__);
+ unsigned int **buckets_face = MEM_mallocN(bucket_tot * sizeof(*buckets_face), __func__);
unsigned int bucket_index;
for (bucket_index = 0; bucket_index < bucket_tot; bucket_index++) {
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -2051,8 +2051,10 @@
printf("Warning: material \"%s\" skipped - to convert old game texface to material go to the Help menu.\n", ma->id.name + 2);
nowarning = 0;
}
- else
- convert_tfacematerial(main, ma); continue;
+ else {
+ convert_tfacematerial(main, ma);
+ }
+ continue;
}
/* no conflicts in this material - 90% of cases
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -2446,6 +2446,7 @@
for (ml = mb->elems.first; ml; ml = ml->next) {
add_v3_v3(r_cent, &ml->x);
+ total++;
}
if (total) {
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/movieclip.c 2013-07-13 20:30:34 UTC (rev 58224)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/movieclip.c 2013-07-13 22:55:28 UTC (rev 58225)
@@ -440,7 +440,7 @@
MovieClipImBufCacheKey *key = (MovieClipImBufCacheKey *) key_v;
MovieClipCachePriorityData *priority_data;
- priority_data = MEM_callocN(sizeof(priority_data), "movie cache clip priority data");
+ priority_data = MEM_callocN(sizeof(*priority_data), "movie cache clip priority data");
priority_data->framenr = key->framenr;
return priority_data;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c 2013-07-13 20:30:34 UTC (rev 58224)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list