[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57117] tags/blender-2.67b-release/blender : svn merge ^/trunk/ blender -c57046 -c57050 -c57052 -c57057 -c57063 -c57064 -c57067 -c57068
Campbell Barton
ideasman42 at gmail.com
Wed May 29 18:00:53 CEST 2013
Revision: 57117
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57117
Author: campbellbarton
Date: 2013-05-29 16:00:52 +0000 (Wed, 29 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c57046 -c57050 -c57052 -c57057 -c57063 -c57064 -c57067 -c57068
Modified Paths:
--------------
tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/particle_system.c
tags/blender-2.67b-release/blender/source/blender/bmesh/operators/bmo_extrude.c
tags/blender-2.67b-release/blender/source/blender/editors/curve/editcurve.c
tags/blender-2.67b-release/blender/source/blender/editors/space_node/space_node.c
tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_buttons.c
tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_view.c
tags/blender-2.67b-release/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp
tags/blender-2.67b-release/blender/source/blender/makesrna/intern/rna_curve.c
tags/blender-2.67b-release/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Property Changed:
----------------
tags/blender-2.67b-release/blender/
Property changes on: tags/blender-2.67b-release/blender
___________________________________________________________________
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
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912,56930,56935,56943,56956-56957,56960,56967-56968,56971,56977,56982,56990-56991,56994,57004,57009,57027,57043
+ /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
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912,56930,56935,56943,56956-56957,56960,56967-56968,56971,56977,56982,56990-56991,56994,57004,57009,57027,57043,57046,57050,57052,57057,57063-57064,57067-57068
Modified: tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/particle_system.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/particle_system.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -4100,6 +4100,7 @@
{
ParticleSystem *psys = sim->psys;
ParticleSettings *part=psys->part;
+ RNG *rng;
BoidBrainData bbd;
ParticleTexture ptex;
PARTICLE_P;
@@ -4127,6 +4128,8 @@
}
BLI_srandom(31415926 + (int)cfra + psys->seed);
+ /* for now do both, boids us 'rng' */
+ rng = BLI_rng_new_srandom(31415926 + (int)cfra + psys->seed);
psys_update_effectors(sim);
@@ -4143,6 +4146,7 @@
bbd.cfra = cfra;
bbd.dfra = dfra;
bbd.timestep = timestep;
+ bbd.rng = rng;
psys_update_particle_tree(psys, cfra);
@@ -4326,6 +4330,7 @@
}
free_collider_cache(&sim->colliders);
+ BLI_rng_free(rng);
}
static void update_children(ParticleSimulationData *sim)
{
Modified: tags/blender-2.67b-release/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/bmesh/operators/bmo_extrude.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/bmesh/operators/bmo_extrude.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -409,6 +409,12 @@
continue;
}
+ /* skip creating face for excluded edges see [#35503] */
+ if (BMO_slot_map_contains(slot_edges_exclude, e)) {
+ /* simply skip creating the face */
+ continue;
+ }
+
e_new = *(BMEdge **)BMO_iter_map_value(&siter);
if (!e_new) {
Modified: tags/blender-2.67b-release/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/editors/curve/editcurve.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/editors/curve/editcurve.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -1177,7 +1177,11 @@
int ED_curve_updateAnimPaths(Curve *cu)
{
AnimData *adt = BKE_animdata_from_id(&cu->id);
+ EditNurb *editnurb = cu->editnurb;
+ if (!editnurb->keyindex)
+ return 0;
+
if (!curve_is_animated(cu)) return 0;
if (adt->action)
@@ -1416,12 +1420,14 @@
newedit = newcu->editnurb;
BKE_nurbList_free(&newedit->nurbs);
BKE_curve_editNurb_keyIndex_free(newedit);
+ newedit->keyindex = NULL;
/* 3. move over parts from old object */
for (nu = oldedit->nurbs.first; nu; nu = nu1) {
nu1 = nu->next;
if (isNurbsel(nu)) {
+ keyIndex_delNurb(oldedit, nu);
BLI_remlink(&oldedit->nurbs, nu);
BLI_addtail(&newedit->nurbs, nu);
}
Modified: tags/blender-2.67b-release/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/editors/space_node/space_node.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/editors/space_node/space_node.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -500,8 +500,6 @@
/* default now: refresh node is starting preview */
SpaceNode *snode = sa->spacedata.first;
- ED_preview_kill_jobs(C);
-
snode_set_context(C);
if (snode->nodetree) {
Modified: tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_buttons.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_buttons.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -383,6 +383,7 @@
if (block) { /* buttons */
uiBut *but;
int yi = 200;
+ const float tilt_limit = DEG2RADF(21600.0f);
const int buth = 20 * UI_DPI_FAC;
const int but_margin = 2;
const char *c;
@@ -459,7 +460,7 @@
uiDefButR(block, NUM, 0, IFACE_("Radius"), 0, yi -= buth + but_margin, 200, buth,
&data_ptr, "radius", 0, 0.0, 100.0, 1, 3, NULL);
uiDefButR(block, NUM, 0, IFACE_("Tilt"), 0, yi -= buth + but_margin, 200, buth,
- &data_ptr, "tilt", 0, -FLT_MAX, FLT_MAX, 1, 3, NULL);
+ &data_ptr, "tilt", 0, -tilt_limit, tilt_limit, 1, 3, NULL);
}
else if (totcurvedata > 1) {
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Mean Weight:"),
@@ -470,7 +471,7 @@
&(tfp->ve_median[C_RADIUS]), 0.0, 100.0, 1, 3, TIP_("Radius of curve control points"));
but = uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Mean Tilt:"),
0, yi -= buth + but_margin, 200, buth,
- &(tfp->ve_median[C_TILT]), -FLT_MAX, FLT_MAX, 1, 3,
+ &(tfp->ve_median[C_TILT]), -tilt_limit, tilt_limit, 1, 3,
TIP_("Tilt of curve control points"));
uiButSetUnitType(but, PROP_UNIT_ROTATION);
}
Modified: tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_view.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/editors/space_view3d/view3d_view.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -64,6 +64,8 @@
#include "ED_screen.h"
#include "ED_armature.h"
+#include "RE_engine.h"
+
#ifdef WITH_GAMEENGINE
#include "BL_System.h"
#endif
@@ -1217,6 +1219,13 @@
rv3d->localvd = NULL;
}
}
+
+ if (v3d->drawtype != OB_RENDER) {
+ if (rv3d->render_engine) {
+ RE_engine_free(rv3d->render_engine);
+ rv3d->render_engine = NULL;
+ }
+ }
}
}
}
Modified: tags/blender-2.67b-release/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/freestyle/intern/geometry/FitCurve.cpp 2013-05-29 16:00:52 UTC (rev 57117)
@@ -376,6 +376,12 @@
tHatCenter[0] = (V1[0] + V2[0]) / 2.0;
tHatCenter[1] = (V1[1] + V2[1]) / 2.0;
tHatCenter = *V2Normalize(&tHatCenter);
+
+ /* avoid numerical singularity in the special case when V1 == -V2 */
+ if (V2Length(&tHatCenter) < M_EPSILON) {
+ tHatCenter = *V2Normalize(&V1);
+ }
+
return tHatCenter;
}
Modified: tags/blender-2.67b-release/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/makesrna/intern/rna_curve.c 2013-05-29 15:56:09 UTC (rev 57116)
+++ tags/blender-2.67b-release/blender/source/blender/makesrna/intern/rna_curve.c 2013-05-29 16:00:52 UTC (rev 57117)
@@ -32,6 +32,7 @@
#include "DNA_scene_types.h"
#include "BLI_utildefines.h"
+#include "BLI_math.h"
#include "BKE_font.h"
@@ -688,6 +689,7 @@
{
StructRNA *srna;
PropertyRNA *prop;
+ const float tilt_limit = DEG2RADF(21600.0f);
srna = RNA_def_struct(brna, "SplinePoint", NULL);
RNA_def_struct_sdna(srna, "BPoint");
@@ -720,7 +722,8 @@
/* Number values */
prop = RNA_def_property(srna, "tilt", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_sdna(prop, NULL, "alfa");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list