[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60854] branches/soc-2013-depsgraph_mt: Merging r60847 through r60853 from trunk into soc-2013-depsgraph_mt

Sergey Sharybin sergey.vfx at gmail.com
Sat Oct 19 01:50:29 CEST 2013


Revision: 60854
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60854
Author:   nazgul
Date:     2013-10-18 23:50:29 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
Merging r60847 through r60853 from trunk into soc-2013-depsgraph_mt

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

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/buffers.cpp
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_vector_inline.c

Property Changed:
----------------
    branches/soc-2013-depsgraph_mt/
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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-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:57395-60846
   + /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-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:57395-60853

Modified: branches/soc-2013-depsgraph_mt/intern/cycles/device/device.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/device/device.cpp	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/device/device.cpp	2013-10-18 23:50:29 UTC (rev 60854)
@@ -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: branches/soc-2013-depsgraph_mt/intern/cycles/render/buffers.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/render/buffers.cpp	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/render/buffers.cpp	2013-10-18 23:50:29 UTC (rev 60854)
@@ -184,6 +184,12 @@
 					pixels[0] = (f == 0.0f)? 1e10f: f*scale_exposure;
 				}
 			}
+			else if(type == PASS_MIST) {
+				for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
+					float f = *in;
+					pixels[0] = clamp(f*scale_exposure, 0.0f, 1.0f);
+				}
+			}
 			else {
 				for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
 					float f = *in;

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c	2013-10-18 23:50:29 UTC (rev 60854)
@@ -1637,22 +1637,6 @@
 	}
 }
 
-/* could move to math api */
-BLI_INLINE void copy_v3_fl3(float v[3], float x, float y, float z)
-{
-	v[0] = x;
-	v[1] = y;
-	v[2] = z;
-}
-
-/* TODO(sergey): Perhaps it could be general utility function in mathutils. */
-static bool has_zero_axis_m4(float matrix[4][4])
-{
-	return len_squared_v3(matrix[0]) < FLT_EPSILON ||
-	       len_squared_v3(matrix[1]) < FLT_EPSILON ||
-	       len_squared_v3(matrix[2]) < FLT_EPSILON;
-}
-
 static float init_meta(PROCESS *process, Scene *scene, Object *ob)    /* return totsize */
 {
 	Scene *sce_iter = scene;

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c	2013-10-18 23:50:29 UTC (rev 60854)
@@ -1692,16 +1692,6 @@
 
 int BKE_scene_check_color_management_enabled(const Scene *scene)
 {
-	/* TODO(sergey): shouldn't be needed. but we're currently far to close to the release,
-	 *               so better be extra-safe than sorry.
-	 *
-	 *               Will remove the check after the release.
-	 */
-	if (!scene) {
-		BLI_assert(!"Shouldn't happen!");
-		return TRUE;
-	}
-
 	return strcmp(scene->display_settings.display_device, "None") != 0;
 }
 

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_matrix.h	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_matrix.h	2013-10-18 23:50:29 UTC (rev 60854)
@@ -160,6 +160,8 @@
 void pseudoinverse_m4_m4(float Ainv[4][4], float A[4][4], float epsilon);
 void pseudoinverse_m3_m3(float Ainv[3][3], float A[3][3], float epsilon);
 
+bool has_zero_axis_m4(float matrix[4][4]);
+
 /****************************** Transformations ******************************/
 
 void scale_m3_fl(float R[3][3], float scale);

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_vector.h	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_vector.h	2013-10-18 23:50:29 UTC (rev 60854)
@@ -82,6 +82,8 @@
 MINLINE void copy_v2db_v2fl(double r[2], const float a[2]);
 MINLINE void copy_v3db_v3fl(double r[3], const float a[3]);
 MINLINE void copy_v4db_v4fl(double r[4], const float a[4]);
+/* 3 float -> vec */
+MINLINE void copy_v3_fl3(float v[3], float x, float y, float z);
 
 /********************************* Arithmetic ********************************/
 

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_matrix.c	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_matrix.c	2013-10-18 23:50:29 UTC (rev 60854)
@@ -2070,3 +2070,9 @@
 	}
 }
 
+bool has_zero_axis_m4(float matrix[4][4])
+{
+	return len_squared_v3(matrix[0]) < FLT_EPSILON ||
+	       len_squared_v3(matrix[1]) < FLT_EPSILON ||
+	       len_squared_v3(matrix[2]) < FLT_EPSILON;
+}

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_vector_inline.c	2013-10-18 23:44:25 UTC (rev 60853)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_vector_inline.c	2013-10-18 23:50:29 UTC (rev 60854)
@@ -235,6 +235,14 @@
 	SWAP(float, a[3], b[3]);
 }
 
+/* 3 float -> vec */
+MINLINE void copy_v3_fl3(float v[3], float x, float y, float z)
+{
+	v[0] = x;
+	v[1] = y;
+	v[2] = z;
+}
+
 /********************************* Arithmetic ********************************/
 
 MINLINE void add_v2_fl(float r[2], float f)


Property changes on: branches/soc-2013-depsgraph_mt/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/soc-2011-tomato/source/blender/editors/interface/interface.c: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
/trunk/blender/source/blender/editors/interface/interface.c:57395-60846
   + /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

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list