Revision: 48410
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48410
Author: nazgul
Date: 2012-06-29 14:34:29 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Merging r48407 through r48409 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48407
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48409
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-tomato/source/creator/creator.c
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_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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48406
+
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48409
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
2012-06-29 14:32:25 UTC (rev 48409)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
2012-06-29 14:34:29 UTC (rev 48410)
@@ -119,7 +119,8 @@
G_DEBUG_FFMPEG = (1 << 1),
G_DEBUG_PYTHON = (1 << 2), /* extra python info */
G_DEBUG_EVENTS = (1 << 3), /* input/window/screen events */
- G_DEBUG_WM = (1 << 4) /* operator, undo */
+ G_DEBUG_WM = (1 << 4), /* operator, undo */
+ G_DEBUG_JOBS = (1 << 5) /* jobs time profiling */
};
#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON |
G_DEBUG_EVENTS | G_DEBUG_WM)
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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48406
+ /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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48409
Modified:
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
2012-06-29 14:32:25 UTC (rev 48409)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
2012-06-29 14:34:29 UTC (rev 48410)
@@ -313,10 +313,13 @@
edgering_sel(lcd, cuts, 1);
if (lcd->do_cut) {
+ /* Enable gridfill, so that intersecting loopcut works
as one would expect.
+ * Note though that it will break edgeslide in this
specific case.
+ * See [#31939]. */
BM_mesh_esubdivide(em->bm, BM_ELEM_SELECT,
0.0f, 0.0f, 0.0f,
cuts,
- SUBDIV_SELECT_LOOPCUT, SUBD_PATH, 0,
FALSE, 0);
+ SUBDIV_SELECT_LOOPCUT, SUBD_PATH, 0,
TRUE, 0);
/* force edge slide to edge select mode in in face
select mode */
if (em->selectmode & SCE_SELECT_FACE) {
@@ -336,7 +339,8 @@
DAG_id_tag_update(lcd->ob->data, 0);
}
else {
-
+ /* XXX Is this piece of code ever used now? Simple loop
select is now
+ * in editmesh_select.c (around line 1000)... */
/* sets as active, useful for other tools */
if (em->selectmode & SCE_SELECT_VERTEX)
BM_select_history_store(em->bm, lcd->eed->v1);
/* low priority TODO, get vertrex close to mouse */
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48406
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48409
Modified: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
2012-06-29 14:32:25 UTC (rev 48409)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
2012-06-29 14:34:29 UTC (rev 48410)
@@ -54,8 +54,8 @@
#include "wm_event_types.h"
#include "wm.h"
+#include "PIL_time.h"
-
/* ********************** Threaded Jobs Manager ******************************
*/
/*
@@ -127,6 +127,7 @@
/* we use BLI_threads api, but per job only 1 thread runs */
ListBase threads;
+ double start_time;
};
/* finds:
@@ -343,6 +344,9 @@
/* restarted job has timer already */
if (steve->wt == NULL)
steve->wt = WM_event_add_timer(wm, steve->win,
TIMERJOBS, steve->timestep);
+
+ if (G.debug & G_DEBUG_JOBS)
+ steve->start_time = PIL_check_seconds_timer();
}
else printf("job fails, not initialized\n");
}
@@ -465,6 +469,11 @@
// if (steve->stop) printf("job ready
but stopped %s\n", steve->name);
// else printf("job finished %s\n",
steve->name);
+ if (G.debug & G_DEBUG_JOBS) {
+ printf("Job '%s' finished in %f
seconds\n", steve->name,
+
PIL_check_seconds_timer() - steve->start_time);
+ }
+
steve->running = 0;
BLI_end_threads(&steve->threads);
Modified: branches/soc-2011-tomato/source/creator/creator.c
===================================================================
--- branches/soc-2011-tomato/source/creator/creator.c 2012-06-29 14:32:25 UTC
(rev 48409)
+++ branches/soc-2011-tomato/source/creator/creator.c 2012-06-29 14:34:29 UTC
(rev 48410)
@@ -1144,6 +1144,7 @@
#endif
BLI_argsAdd(ba, 1, NULL, "--debug-value", "<value>\n\tSet debug value
of <value> on startup\n", set_debug_value, NULL);
+ BLI_argsAdd(ba, 1, NULL, "--debug-jobs", "\n\tEnable time profiling
for background jobs.", debug_mode_generic, (void *)G_DEBUG_JOBS);
BLI_argsAdd(ba, 1, NULL, "--verbose", "<verbose>\n\tSet logging
verbosity level.", set_verbosity, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
