[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58053] branches/soc-2013-cycles_mblur: Merged trunk into branch.

[Gavin Howard]

Revision: 58053
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58053
Author:   gdh
Date:     2013-07-07 03:48:02 +0000 (Sun, 07 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58032 to r58051.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58032
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58051

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/render/mesh.h
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58031
   + /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-58051

Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/mesh.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/mesh.h	2013-07-07 03:28:44 UTC (rev 58052)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/mesh.h	2013-07-07 03:48:02 UTC (rev 58053)
@@ -89,6 +89,8 @@
 	BoundBox bounds;
 	bool transform_applied;
 	bool transform_negative_scaled;
+	bool use_deform_mblur;
+	uint mblur_steps;
 	Transform transform_normal;
 	DisplacementMethod displacement_method;
 

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c	2013-07-07 03:28:44 UTC (rev 58052)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c	2013-07-07 03:48:02 UTC (rev 58053)
@@ -1253,13 +1253,8 @@
 
 		/* check for empty path */
 		if (guess_path && simopts->filepath[0] == 0) {
-			if ((G.ima[0] == '/') && (G.ima[1] == '/') && (G.ima[2] == '\0')) {
-				BLI_strncpy(simopts->filepath, "//untitled", FILE_MAX);
-			}
-			else {
-				BLI_strncpy(simopts->filepath, G.ima, FILE_MAX);
-			}
-			BLI_path_abs(simopts->filepath, G.main->name);
+			BLI_snprintf(simopts->filepath, sizeof(simopts->filepath), "//%s", ima->id.name + 2);
+			BLI_path_abs(simopts->filepath, STREQ(G.ima, "//") ? G.main->name : G.ima);
 		}
 
 		/* color management */

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c	2013-07-07 03:28:44 UTC (rev 58052)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c	2013-07-07 03:48:02 UTC (rev 58053)
@@ -866,7 +866,7 @@
 	return (seq_first_new != NULL);
 }
 
-static bool insert_gap(Scene *scene, int gap, int cfra)
+static bool sequence_offset_after_frame(Scene *scene, const int delta, const int cfra)
 {
 	Sequence *seq;
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
@@ -876,15 +876,13 @@
 	
 	if (ed == NULL) return 0;
 
-	SEQP_BEGIN (ed, seq)
-	{
+	for (seq = ed->seqbasep->first; seq; seq = seq->next) {
 		if (seq->startdisp >= cfra) {
-			seq->start += gap;
+			BKE_sequence_translate(scene, seq, delta);
 			BKE_sequence_calc(scene, seq);
 			done = true;
 		}
 	}
-	SEQ_END
 
 	return done;
 }
@@ -1017,7 +1015,7 @@
 		else if (BKE_sequencer_evaluate_frame(scene, cfra) == 0) {
 			done = true;
 			while (BKE_sequencer_evaluate_frame(scene, cfra) == 0) {
-				done = insert_gap(scene, -1, cfra);
+				done = sequence_offset_after_frame(scene, -1, cfra);
 				if (done == false) break;
 			}
 			if (done == false || do_all == false) break;
@@ -1054,7 +1052,7 @@
 	Scene *scene = CTX_data_scene(C);
 	int frames = RNA_int_get(op->ptr, "frames");
 	
-	insert_gap(scene, frames, CFRA);
+	sequence_offset_after_frame(scene, frames, CFRA);
 	
 	WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
 	

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c	2013-07-07 03:28:44 UTC (rev 58052)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c	2013-07-07 03:48:02 UTC (rev 58053)
@@ -1676,9 +1676,9 @@
 	 */
 	UI_ThemeColorShade(TH_TEXT_HI, -50);
 #ifdef WITH_INTERNATIONAL
-	BLF_draw_default(xco, ar->winy - 17, 0.0f, printable, sizeof(printable));
+	BLF_draw_default(xco, ar->winy - 17, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
 #else
-	BLF_draw_default_ascii(xco, ar->winy - 17, 0.0f, printable, sizeof(printable));
+	BLF_draw_default_ascii(xco, ar->winy - 17, 0.0f, printable, BLF_DRAW_STR_DUMMY_MAX);
 #endif
 	
 	/* autokey recording icon... */

Modified: branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c	2013-07-07 03:28:44 UTC (rev 58052)
+++ branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c	2013-07-07 03:48:02 UTC (rev 58053)
@@ -4903,13 +4903,13 @@
 	if (re->wrld.aosphere) {
 		MEM_freeN(re->wrld.aosphere);
 		re->wrld.aosphere= NULL;
-		if (re->scene)
+		if (re->scene && re->scene->world)
 			re->scene->world->aosphere= NULL;
 	}
 	if (re->wrld.aotables) {
 		MEM_freeN(re->wrld.aotables);
 		re->wrld.aotables= NULL;
-		if (re->scene)
+		if (re->scene && re->scene->world)
 			re->scene->world->aotables= NULL;
 	}
 	if (re->r.mode & R_RAYTRACE)