[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58681] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sun Jul 28 07:54:17 CEST 2013
Revision: 58681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58681
Author: gdh
Date: 2013-07-28 05:54:17 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58667 to r58680.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58680
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/fileops.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_cloth.c
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58666
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58680
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c 2013-07-27 21:00:41 UTC (rev 58680)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c 2013-07-28 05:54:17 UTC (rev 58681)
@@ -537,7 +537,7 @@
body[0] = suf[0] = '\0';
- for (i = len - 1; i > 1; i--) {
+ for (i = len; i > 0; i--) {
if (is_char_sep(string[i])) {
BLI_strncpy(body, string, i + 1);
BLI_strncpy(suf, string + i, (len + 1) - i);
@@ -545,7 +545,7 @@
}
}
- BLI_strncpy(body, string, len);
+ memcpy(body, string, len + 1);
}
/* "a.b.c" -> ("a.", "b.c") */
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/fileops.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/fileops.c 2013-07-27 21:00:41 UTC (rev 58680)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/fileops.c 2013-07-28 05:54:17 UTC (rev 58681)
@@ -911,18 +911,15 @@
char static_buf[MAXPATHLEN];
#endif
char *tmp;
- int needs_free;
if (BLI_exists(dirname)) return;
#ifdef MAXPATHLEN
size = MAXPATHLEN;
tmp = static_buf;
- needs_free = 0;
#else
size = strlen(dirname) + 1;
- tmp = MEM_callocN(size, "BLI_dir_create_recursive tmp");
- needs_free = 1;
+ tmp = MEM_callocN(size, __func__);
#endif
BLI_strncpy(tmp, dirname, size);
@@ -934,8 +931,9 @@
BLI_dir_create_recursive(tmp);
}
- if (needs_free)
- MEM_freeN(tmp);
+#ifndef MAXPATHLEN
+ MEM_freeN(tmp);
+#endif
mkdir(dirname, 0777);
}
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c 2013-07-27 21:00:41 UTC (rev 58680)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/screen/area.c 2013-07-28 05:54:17 UTC (rev 58681)
@@ -420,7 +420,7 @@
/* note; this sets state, so we can use wmOrtho and friends */
wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct);
- UI_SetTheme(sa ? sa->spacetype : 0, ar->type ? ar->type->regionid : 0);
+ UI_SetTheme(sa ? sa->spacetype : 0, at->regionid);
/* optional header info instead? */
if (ar->headerstr) {
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c 2013-07-27 21:00:41 UTC (rev 58680)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c 2013-07-28 05:54:17 UTC (rev 58681)
@@ -202,7 +202,7 @@
}
/* skip smooth viewing for render engine draw */
- if (C && U.smooth_viewtx && v3d->drawtype != OB_RENDER) {
+ if (U.smooth_viewtx && v3d->drawtype != OB_RENDER) {
bool changed = false; /* zero means no difference */
if (oldcamera != camera)
@@ -753,7 +753,7 @@
glGetFloatv(GL_PROJECTION_MATRIX, (float *)rv3d->winmat);
}
-static void obmat_to_viewmat(View3D *v3d, RegionView3D *rv3d, Object *ob, short smooth)
+static void obmat_to_viewmat(RegionView3D *rv3d, Object *ob)
{
float bmat[4][4];
float tmat[3][3];
@@ -766,36 +766,7 @@
/* view quat calculation, needed for add object */
copy_m3_m4(tmat, rv3d->viewmat);
- if (smooth) {
- float new_quat[4];
- if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
- /* were from a camera view */
-
- float orig_ofs[3];
- float orig_dist = rv3d->dist;
- float orig_lens = v3d->lens;
- copy_v3_v3(orig_ofs, rv3d->ofs);
-
- /* Switch from camera view */
- mat3_to_quat(new_quat, tmat);
-
- rv3d->persp = RV3D_PERSP;
- rv3d->dist = 0.0;
-
- ED_view3d_from_object(v3d->camera, rv3d->ofs, NULL, NULL, &v3d->lens);
- view3d_smooth_view(NULL, NULL, NULL, NULL, NULL, orig_ofs, new_quat, &orig_dist, &orig_lens); /* XXX */
-
- rv3d->persp = RV3D_CAMOB; /* just to be polite, not needed */
-
- }
- else {
- mat3_to_quat(new_quat, tmat);
- view3d_smooth_view(NULL, NULL, NULL, NULL, NULL, NULL, new_quat, NULL, NULL); /* XXX */
- }
- }
- else {
- mat3_to_quat(rv3d->viewquat, tmat);
- }
+ mat3_to_quat(rv3d->viewquat, tmat);
}
#define QUATSET(a, b, c, d, e) { a[0] = b; a[1] = c; a[2] = d; a[3] = e; } (void)0
@@ -839,7 +810,7 @@
if (rv3d->persp == RV3D_CAMOB) { /* obs/camera */
if (v3d->camera) {
BKE_object_where_is_calc(scene, v3d->camera);
- obmat_to_viewmat(v3d, rv3d, v3d->camera, 0);
+ obmat_to_viewmat(rv3d, v3d->camera);
}
else {
quat_to_mat4(rv3d->viewmat, rv3d->viewquat);
@@ -1562,40 +1533,6 @@
/* ************************************** */
-static void UNUSED_FUNCTION(view3d_align_axis_to_vector)(View3D *v3d, RegionView3D *rv3d, int axisidx, float vec[3])
-{
- float alignaxis[3] = {0.0, 0.0, 0.0};
- float norm[3], axis[3], angle, new_quat[4];
-
- if (axisidx > 0) alignaxis[axisidx - 1] = 1.0;
- else alignaxis[-axisidx - 1] = -1.0;
-
- normalize_v3_v3(norm, vec);
-
- angle = (float)acos(dot_v3v3(alignaxis, norm));
- cross_v3_v3v3(axis, alignaxis, norm);
- axis_angle_to_quat(new_quat, axis, -angle);
-
- rv3d->view = RV3D_VIEW_USER;
-
- if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
- /* switch out of camera view */
- float orig_ofs[3];
- float orig_dist = rv3d->dist;
- float orig_lens = v3d->lens;
-
- copy_v3_v3(orig_ofs, rv3d->ofs);
- rv3d->persp = RV3D_PERSP;
- rv3d->dist = 0.0;
- ED_view3d_from_object(v3d->camera, rv3d->ofs, NULL, NULL, &v3d->lens);
- view3d_smooth_view(NULL, NULL, NULL, NULL, NULL, orig_ofs, new_quat, &orig_dist, &orig_lens); /* XXX */
- }
- else {
- if (rv3d->persp == RV3D_CAMOB) rv3d->persp = RV3D_PERSP; /* switch out of camera mode */
- view3d_smooth_view(NULL, NULL, NULL, NULL, NULL, NULL, new_quat, NULL, NULL); /* XXX */
- }
-}
-
float ED_view3d_pixel_size(RegionView3D *rv3d, const float co[3])
{
return mul_project_m4_v3_zfac(rv3d->persmat, co) * rv3d->pixsize * U.pixelsize;
Modified: branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_cloth.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_cloth.c 2013-07-27 21:00:41 UTC (rev 58680)
+++ branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_cloth.c 2013-07-28 05:54:17 UTC (rev 58681)
@@ -72,7 +72,6 @@
{
DerivedMesh *dm;
ClothModifierData *clmd = (ClothModifierData *) md;
- DerivedMesh *result = NULL;
/* check for alloc failing */
if (!clmd->sim_parms || !clmd->coll_parms) {
@@ -92,11 +91,6 @@
clothModifier_do(clmd, md->scene, ob, dm, vertexCos);
- if (result) {
- result->getVertCos(result, vertexCos);
- result->release(result);
- }
-
dm->release(dm);
}
More information about the Bf-blender-cvs
mailing list