[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60871] tags/blender-2.69-release/blender: svn merge ^/trunk/blender -c60814 -c60848

[Brecht Van Lommel]

Revision: 60871
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60871
Author:   blendix
Date:     2013-10-20 14:37:14 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c60814 -c60848

Merge two more small fixes for the release.

Modified Paths:
--------------
    tags/blender-2.69-release/blender/intern/cycles/device/device.cpp
    tags/blender-2.69-release/blender/source/blender/editors/space_clip/clip_editor.c

Property Changed:
----------------
    tags/blender-2.69-release/blender/


Property changes on: tags/blender-2.69-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:60592-60596,60599,60605,60626,60630,60635,60639,60644,60649,60673-60675,60680,60682-60683,60685,60689,60695,60703,60707-60709,60712,60723-60724,60731,60740,60742-60743,60747,60749,60752,60755,60760
   + /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:60592-60596,60599,60605,60626,60630,60635,60639,60644,60649,60673-60675,60680,60682-60683,60685,60689,60695,60703,60707-60709,60712,60723-60724,60731,60740,60742-60743,60747,60749,60752,60755,60760,60814,60848

Modified: tags/blender-2.69-release/blender/intern/cycles/device/device.cpp
===================================================================
--- tags/blender-2.69-release/blender/intern/cycles/device/device.cpp	2013-10-20 13:01:07 UTC (rev 60870)
+++ tags/blender-2.69-release/blender/intern/cycles/device/device.cpp	2013-10-20 14:37:14 UTC (rev 60871)
@@ -64,11 +64,16 @@
 	glColor3f(1.0f, 1.0f, 1.0f);
 
 	if(rgba.data_type == TYPE_HALF) {
+		/* for multi devices, this assumes the ineffecient method that we allocate
+		 * all pixels on the device even though we only render to a subset */
+		GLhalf *data_pointer = (GLhalf*)rgba.data_pointer;
+		data_pointer += 4*y*w;
+
 		/* draw half float texture, GLSL shader for display transform assumed to be bound */
 		GLuint texid;
 		glGenTextures(1, &texid);
 		glBindTexture(GL_TEXTURE_2D, texid);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, (void*)rgba.data_pointer);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, data_pointer);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 

Modified: tags/blender-2.69-release/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- tags/blender-2.69-release/blender/source/blender/editors/space_clip/clip_editor.c	2013-10-20 13:01:07 UTC (rev 60870)
+++ tags/blender-2.69-release/blender/source/blender/editors/space_clip/clip_editor.c	2013-10-20 14:37:14 UTC (rev 60871)
@@ -711,7 +711,7 @@
 			current_frame = prefetch_find_uncached_frame(clip, queue->current_frame + 1, queue->end_frame,
 			                                             queue->render_size, queue->render_flag, 1);
 			/* switch direction if read frames from current up to scene end frames */
-			if (current_frame >= queue->end_frame) {
+			if (current_frame > queue->end_frame) {
 				queue->current_frame = queue->initial_frame;
 				queue->direction = -1;
 			}