[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50423] branches/soc-2011-tomato: Merging r50413 through r50422 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 50423
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50423
Author:   nazgul
Date:     2012-09-05 14:19:40 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Merging r50413 through r50422 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/cycles/render/attribute.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.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-50412
   + /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-50422

Modified: branches/soc-2011-tomato/intern/cycles/render/attribute.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/attribute.cpp	2012-09-05 14:11:22 UTC (rev 50422)
+++ branches/soc-2011-tomato/intern/cycles/render/attribute.cpp	2012-09-05 14:19:40 UTC (rev 50423)
@@ -102,6 +102,8 @@
 		return ustring("motion_pre");
 	else if(std == ATTR_STD_MOTION_POST)
 		return ustring("motion_post");
+	else if(std == ATTR_STD_PARTICLE)
+		return ustring("particle");
 
 	return ustring();
 }

Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-09-05 14:11:22 UTC (rev 50422)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-09-05 14:19:40 UTC (rev 50423)
@@ -93,8 +93,10 @@
 				if (node->original) { \
 					node = node->original; \
 				} \
-				if (g_highlightIndex < MAX_HIGHLIGHT) { \
-					g_highlightedNodes[g_highlightIndex++] = node; \
+				if (g_highlightInitialized && g_highlightedNodes) { \
+					if (g_highlightIndex < MAX_HIGHLIGHT) { \
+						g_highlightedNodes[g_highlightIndex++] = node; \
+					} \
 				} \
 			} \
 		} \


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-50412
   + /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-50422


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-50412
   + /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-50422

Modified: branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.c	2012-09-05 14:11:22 UTC (rev 50422)
+++ branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.c	2012-09-05 14:19:40 UTC (rev 50423)
@@ -171,8 +171,12 @@
 static int sample_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	ARegion *ar = CTX_wm_region(C);
+	SpaceSeq *sseq = CTX_wm_space_seq(C);
 	ImageSampleInfo *info;
 
+	if (sseq->mainb != SEQ_DRAW_IMG_IMBUF)
+		return OPERATOR_CANCELLED;
+
 	info = MEM_callocN(sizeof(ImageSampleInfo), "ImageSampleInfo");
 	info->art = ar->type;
 	info->draw_handle = ED_region_draw_cb_activate(ar->type, sample_draw, info, REGION_DRAW_POST_PIXEL);