[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53098] tags/blender-2.65a-release/blender : svn merge ^/trunk/blender -c53086 -c53087 -c53090 -c53095
Campbell Barton
ideasman42 at gmail.com
Tue Dec 18 01:10:26 CET 2012
Revision: 53098
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53098
Author: campbellbarton
Date: 2012-12-18 00:10:24 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
svn merge ^/trunk/blender -c53086 -c53087 -c53090 -c53095
Modified Paths:
--------------
tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/key.c
tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_select.c
tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_tools.c
tags/blender-2.65a-release/blender/source/blender/editors/sculpt_paint/paint_vertex.c
tags/blender-2.65a-release/blender/source/blender/render/intern/include/render_types.h
tags/blender-2.65a-release/blender/source/blender/render/intern/source/pipeline.c
tags/blender-2.65a-release/blender/source/blender/render/intern/source/pointdensity.c
Property Changed:
----------------
tags/blender-2.65a-release/blender/
Property changes on: tags/blender-2.65a-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
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077
+ /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
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095
Modified: tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/key.c 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/key.c 2012-12-18 00:10:24 UTC (rev 53098)
@@ -1078,7 +1078,7 @@
if (key->slurph && key->type != KEY_RELATIVE) {
const float ctime_scaled = key->ctime / 100.0f;
float delta = (float)key->slurph / tot;
- float cfra = (float)scene->r.cfra;
+ float cfra = (float)scene->r.cfra + scene->r.subframe;
int step, a;
if (tot > 100 && slurph_opt) {
@@ -1176,7 +1176,7 @@
if (key->slurph && key->type != KEY_RELATIVE) {
const float ctime_scaled = key->ctime / 100.0f;
float delta = (float)key->slurph / tot;
- float cfra = (float)scene->r.cfra;
+ float cfra = (float)scene->r.cfra + scene->r.subframe;
Nurb *nu;
int i = 0, remain = 0;
int step, a;
@@ -1258,7 +1258,7 @@
if (key->slurph && key->type != KEY_RELATIVE) {
const float ctime_scaled = key->ctime / 100.0f;
float delta = (float)key->slurph / tot;
- float cfra = (float)scene->r.cfra;
+ float cfra = (float)scene->r.cfra + scene->r.subframe;
int a;
for (a = 0; a < tot; a++, cfra += delta) {
@@ -1373,7 +1373,7 @@
}
else {
/* do shapekey local drivers */
- float ctime = (float)scene->r.cfra; // XXX this needs to be checked
+ float ctime = (float)scene->r.cfra + scene->r.subframe;
BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime, ADT_RECALC_DRIVERS);
Modified: tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_select.c 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_select.c 2012-12-18 00:10:24 UTC (rev 53098)
@@ -2628,7 +2628,8 @@
int nth = RNA_int_get(op->ptr, "nth");
int offset = RNA_int_get(op->ptr, "offset");
- offset = MIN2(nth, offset);
+ /* so input of offset zero ends up being (nth - 1) */
+ offset = (offset + (nth - 1)) % nth;
if (edbm_deselect_nth(em, nth, offset) == 0) {
BKE_report(op->reports, RPT_ERROR, "Mesh has no active vert/edge/face");
Modified: tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_tools.c 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/editors/mesh/editmesh_tools.c 2012-12-18 00:10:24 UTC (rev 53098)
@@ -3777,7 +3777,7 @@
if (!EDBM_op_init(em, &spinop, op,
"spin geom=%hvef cent=%v axis=%v dvec=%v steps=%i angle=%f use_duplicate=%b",
- BM_ELEM_SELECT, cent, axis, dvec, turns * steps, 360.0f * turns, FALSE))
+ BM_ELEM_SELECT, cent, axis, dvec, turns * steps, DEG2RADF(360.0f * turns), FALSE))
{
return OPERATOR_CANCELLED;
}
@@ -3822,8 +3822,8 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* props */
- RNA_def_int(ot->srna, "steps", 9, 0, INT_MAX, "Steps", "Steps", 0, 256);
- RNA_def_int(ot->srna, "turns", 1, 0, INT_MAX, "Turns", "Turns", 0, 256);
+ RNA_def_int(ot->srna, "steps", 9, 1, INT_MAX, "Steps", "Steps", 3, 256);
+ RNA_def_int(ot->srna, "turns", 1, 1, INT_MAX, "Turns", "Turns", 1, 256);
RNA_def_float_vector(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX,
"Center", "Center in global view space", -FLT_MAX, FLT_MAX);
Modified: tags/blender-2.65a-release/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2012-12-18 00:10:24 UTC (rev 53098)
@@ -346,7 +346,7 @@
if (me->edit_btmesh) return;
/* copies from shadedisplist to mcol */
- if (!me->mloopcol) {
+ if (!me->mloopcol && me->totloop) {
if (!me->mcol) {
CustomData_add_layer(&me->fdata, CD_MCOL, CD_DEFAULT, NULL, me->totface);
}
Modified: tags/blender-2.65a-release/blender/source/blender/render/intern/include/render_types.h
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/render/intern/include/render_types.h 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/render/intern/include/render_types.h 2012-12-18 00:10:24 UTC (rev 53098)
@@ -198,7 +198,6 @@
ListBase strandsurface;
/* use this instead of R.r.cfra */
- float cfra;
float mblur_offs, field_offs;
/* render database */
Modified: tags/blender-2.65a-release/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/render/intern/source/pipeline.c 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/render/intern/source/pipeline.c 2012-12-18 00:10:24 UTC (rev 53098)
@@ -942,6 +942,9 @@
static void do_render_3d(Render *re)
{
+ float cfra;
+ int cfra_backup;
+
/* try external */
if (RE_engine_render(re, 0))
return;
@@ -949,9 +952,13 @@
/* internal */
RE_parts_clamp(re);
-// re->cfra= cfra; /* <- unused! */
- re->scene->r.subframe = re->mblur_offs + re->field_offs;
-
+ /* add motion blur and fields offset to frames */
+ cfra_backup = re->scene->r.cfra;
+
+ cfra = re->scene->r.cfra + re->mblur_offs + re->field_offs;
+ re->scene->r.cfra = floorf(cfra);
+ re->scene->r.subframe = cfra - floorf(cfra);
+
/* lock drawing in UI during data phase */
if (re->draw_lock)
re->draw_lock(re->dlh, 1);
@@ -976,6 +983,7 @@
/* free all render verts etc */
RE_Database_Free(re);
+ re->scene->r.cfra = cfra_backup;
re->scene->r.subframe = 0.f;
}
Modified: tags/blender-2.65a-release/blender/source/blender/render/intern/source/pointdensity.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/render/intern/source/pointdensity.c 2012-12-18 00:07:25 UTC (rev 53097)
+++ tags/blender-2.65a-release/blender/source/blender/render/intern/source/pointdensity.c 2012-12-18 00:10:24 UTC (rev 53098)
@@ -447,7 +447,7 @@
turb = BLI_gTurbulence(pd->noise_size, texvec[0]+age, texvec[1]+age, texvec[2]+age, pd->noise_depth, 0, pd->noise_basis);
}
else if (pd->noise_influence == TEX_PD_NOISE_TIME) {
- time = R.cfra / (float)R.r.efra;
+ time = R.r.cfra / (float)R.r.efra;
turb = BLI_gTurbulence(pd->noise_size, texvec[0]+time, texvec[1]+time, texvec[2]+time, pd->noise_depth, 0, pd->noise_basis);
//turb = BLI_turbulence(pd->noise_size, texvec[0]+time, texvec[1]+time, texvec[2]+time, pd->noise_depth);
}
More information about the Bf-blender-cvs
mailing list