Revision: 58956
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58956
Author: nazgul
Date: 2013-08-06 04:16:09 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Merging r58947 through r58955 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58955
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/avi/intern/avi_mjpeg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_select.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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-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
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-58946
+ /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-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
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-58955
Modified: branches/soc-2011-tomato/source/blender/avi/intern/avi_mjpeg.c
===================================================================
--- branches/soc-2011-tomato/source/blender/avi/intern/avi_mjpeg.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/avi/intern/avi_mjpeg.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -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-2011-tomato/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -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-2011-tomato/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -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) {
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -86,7 +86,7 @@
{
float itarget[4][4];
invert_m4_m4(itarget, target);
- mul_serie_m4(data->local2target, itarget, local, NULL, NULL, NULL,
NULL, NULL, NULL);
+ mul_m4_m4m4(data->local2target, itarget, local);
invert_m4_m4(data->target2local, data->local2target);
}
@@ -428,7 +428,7 @@
BVHTreeNearest nearest = NULL_BVHTreeNearest;
/* Create a bvh-tree of the given target */
- TIMEIT_BENCH(bvhtree_from_mesh_faces(&treeData, calc->target, 0.0, 2,
6), bvhtree_faces);
+ bvhtree_from_mesh_faces(&treeData, calc->target, 0.0, 2, 6);
if (treeData.tree == NULL) {
OUT_OF_MEMORY();
return;
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -433,6 +433,8 @@
void mul_v3_m3v3(float r[3], float M[3][3], const float a[3])
{
+ BLI_assert(r != a);
+
r[0] = M[0][0] * a[0] + M[1][0] * a[1] + M[2][0] * a[2];
r[1] = M[0][1] * a[0] + M[1][1] * a[1] + M[2][1] * a[2];
r[2] = M[0][2] * a[0] + M[1][2] * a[1] + M[2][2] * a[2];
@@ -440,6 +442,8 @@
void mul_v2_m3v3(float r[2], float M[3][3], const float a[3])
{
+ BLI_assert(r != a);
+
r[0] = M[0][0] * a[0] + M[1][0] * a[1] + M[2][0] * a[2];
r[1] = M[0][1] * a[0] + M[1][1] * a[1] + M[2][1] * a[2];
}
Modified:
branches/soc-2011-tomato/source/blender/editors/armature/armature_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/armature/armature_select.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/editors/armature/armature_select.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -714,10 +714,10 @@
}
}
-static void armature_select_more_less(Object* ob, bool more)
+static void armature_select_more_less(Object *ob, bool more)
{
- bArmature* arm = (bArmature *)ob->data;
- EditBone* ebone;
+ bArmature *arm = (bArmature *)ob->data;
+ EditBone *ebone;
/* XXX, eventually we shouldn't need this - campbell */
ED_armature_sync_selection(arm->edbo);
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c:57516
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-58946
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c:57516
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-58955
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
2013-08-06 03:45:27 UTC (rev 58955)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
2013-08-06 04:16:09 UTC (rev 58956)
@@ -809,8 +809,9 @@
}
for (spline = masklay->splines.first; spline; spline =
spline->next) {
+ const bool cyclic = (spline->flag & MASK_SPLINE_CYCLIC)
!= 0;
+ bool start_sel, end_sel, prev_sel, cur_sel;
int i;
- bool start_sel, end_sel, prev_sel, cur_sel, cyclic =
spline->flag & MASK_SPLINE_CYCLIC;
/* reselect point if any handle is selected to make the
result more predictable */
for (i = 0; i < spline->tot_point; i++) {
@@ -826,6 +827,10 @@
start_sel =
!!MASKPOINT_ISSEL_KNOT(spline->points);
end_sel =
!!MASKPOINT_ISSEL_KNOT(&spline->points[spline->tot_point - 1]);
}
+ else {
+ start_sel = false;
+ end_sel = false;
+ }
for (i = 0; i < spline->tot_point; i++) {
if (i == 0 && !cyclic) {
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
2013-08-06 03:45:27 UTC (rev 58955)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
