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

Gavin Howard gavin.d.howard at gmail.com
Thu Jul 18 07:35:01 CEST 2013


Revision: 58359
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58359
Author:   gdh
Date:     2013-07-18 05:35:00 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58285 to r58358.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_light.h
    branches/soc-2013-cycles_mblur/intern/opencl/OCL_opencl.h
    branches/soc-2013-cycles_mblur/intern/opencl/intern/OCL_opencl.c
    branches/soc-2013-cycles_mblur/intern/opencl/intern/clew.c
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_shading.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_action/action_edit.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/cineon/logImageCore.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm_api.c

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


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-58319
   + /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-58358

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_light.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_light.h	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_light.h	2013-07-18 05:35:00 UTC (rev 58359)
@@ -271,7 +271,7 @@
 			ls->pdf = invarea;
 
 			if(type == LIGHT_SPOT) {
-				/* spot light attentuation */
+				/* spot light attenuation */
 				float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2);
 				ls->eval_fac *= spot_light_attenuation(data1, data2, ls);
 			}

Modified: branches/soc-2013-cycles_mblur/intern/opencl/OCL_opencl.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/opencl/OCL_opencl.h	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/intern/opencl/OCL_opencl.h	2013-07-18 05:35:00 UTC (rev 58359)
@@ -28,7 +28,7 @@
 #endif
 
 #include "intern/clew.h"
-void OCL_init(void);
+int OCL_init(void);
 
 #ifdef __cplusplus
 }

Modified: branches/soc-2013-cycles_mblur/intern/opencl/intern/OCL_opencl.c
===================================================================
--- branches/soc-2013-cycles_mblur/intern/opencl/intern/OCL_opencl.c	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/intern/opencl/intern/OCL_opencl.c	2013-07-18 05:35:00 UTC (rev 58359)
@@ -22,7 +22,7 @@
 
 #include "OCL_opencl.h"
 
-void OCL_init(void)
+int OCL_init(void)
 {
 #ifdef _WIN32
 	const char *path = "OpenCL.dll";
@@ -32,6 +32,6 @@
 	const char *path = "libOpenCL.so";
 #endif
 
-	clewInit(path);
+	return (clewInit(path) == CLEW_SUCCESS);
 }
 

Modified: branches/soc-2013-cycles_mblur/intern/opencl/intern/clew.c
===================================================================
--- branches/soc-2013-cycles_mblur/intern/opencl/intern/clew.c	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/intern/opencl/intern/clew.c	2013-07-18 05:35:00 UTC (rev 58359)
@@ -227,6 +227,11 @@
     __oclEnqueueWaitForEvents          = (PFNCLENQUEUEWAITFOREVENTS        )CLCC_DYNLIB_IMPORT(module, "clEnqueueWaitForEvents");
     __oclEnqueueBarrier                = (PFNCLENQUEUEBARRIER              )CLCC_DYNLIB_IMPORT(module, "clEnqueueBarrier");
     __oclGetExtensionFunctionAddress   = (PFNCLGETEXTENSIONFUNCTIONADDRESS )CLCC_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress");
+	
+	if(__oclGetPlatformIDs == NULL) return CLEW_ERROR_OPEN_FAILED;
+	if(__oclGetPlatformInfo == NULL) return CLEW_ERROR_OPEN_FAILED;
+	if(__oclGetDeviceIDs == NULL) return CLEW_ERROR_OPEN_FAILED;
+	if(__oclGetDeviceInfo == NULL) return CLEW_ERROR_OPEN_FAILED;
 
     return CLEW_SUCCESS;
 }

Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py	2013-07-18 05:35:00 UTC (rev 58359)
@@ -66,8 +66,12 @@
 
         # convert mouse position to the View2D for later node placement
         if context.region.type == 'WINDOW':
+            # XXX, temp fix for [#35920], still fails for (U.pixelsize != 1)
+            dpi_fac = context.user_preferences.system.dpi / 72.0
             space.cursor_location = v2d.region_to_view(event.mouse_region_x,
                                                        event.mouse_region_y)
+            space.cursor_location /= dpi_fac
+
         else:
             space.cursor_location = tree.view_center
 

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_fcurve.h	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_fcurve.h	2013-07-18 05:35:00 UTC (rev 58359)
@@ -216,7 +216,7 @@
 int binarysearch_bezt_index(struct BezTriple array[], float frame, int arraylen, bool *r_replace);
 
 /* get the time extents for F-Curve */
-void calc_fcurve_range(struct FCurve *fcu, float *min, float *max,
+bool calc_fcurve_range(struct FCurve *fcu, float *min, float *max,
                        const short do_sel_only, const short do_min_length);
 
 /* get the bounding-box extents for F-Curve */

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c	2013-07-18 05:35:00 UTC (rev 58359)
@@ -2323,6 +2323,7 @@
 			bl = MEM_callocN(sizeof(BevList) + 1 * sizeof(BevPoint), "makeBevelList1");
 			BLI_addtail(&(cu->bev), bl);
 			bl->nr = 0;
+			bl->charidx = nu->charidx;
 		}
 		else {
 			if (G.is_rendering && cu->resolu_ren != 0)
@@ -2335,10 +2336,10 @@
 				bl = MEM_callocN(sizeof(BevList) + len * sizeof(BevPoint), "makeBevelList2");
 				BLI_addtail(&(cu->bev), bl);
 
-				if (nu->flagu & CU_NURB_CYCLIC) bl->poly = 0;
-				else bl->poly = -1;
+				bl->poly = (nu->flagu & CU_NURB_CYCLIC) ? 0 : -1;
 				bl->nr = len;
 				bl->dupe_nr = 0;
+				bl->charidx = nu->charidx;
 				bevp = (BevPoint *)(bl + 1);
 				bp = nu->bp;
 
@@ -2358,8 +2359,8 @@
 				bl = MEM_callocN(sizeof(BevList) + len * sizeof(BevPoint), "makeBevelBPoints");
 				BLI_addtail(&(cu->bev), bl);
 
-				if (nu->flagu & CU_NURB_CYCLIC) bl->poly = 0;
-				else bl->poly = -1;
+				bl->poly = (nu->flagu & CU_NURB_CYCLIC) ? 0 : -1;
+				bl->charidx = nu->charidx;
 				bevp = (BevPoint *)(bl + 1);
 
 				a = nu->pntsu - 1;
@@ -2445,8 +2446,8 @@
 					BLI_addtail(&(cu->bev), bl);
 					bl->nr = len;
 					bl->dupe_nr = 0;
-					if (nu->flagu & CU_NURB_CYCLIC) bl->poly = 0;
-					else bl->poly = -1;
+					bl->poly = (nu->flagu & CU_NURB_CYCLIC) ? 0 : -1;
+					bl->charidx = nu->charidx;
 					bevp = (BevPoint *)(bl + 1);
 
 					BKE_nurb_makeCurve(nu, &bevp->vec[0],
@@ -2572,9 +2573,11 @@
 			bl = sd->bl;     /* is bl a hole? */
 			sd1 = sortdata + (a - 1);
 			for (b = a - 1; b >= 0; b--, sd1--) { /* all polys to the left */
-				if (bevelinside(sd1->bl, bl)) {
-					bl->hole = 1 - sd1->bl->hole;
-					break;
+				if (sd1->bl->charidx == bl->charidx) { /* for text, only check matching char */
+					if (bevelinside(sd1->bl, bl)) {
+						bl->hole = 1 - sd1->bl->hole;
+						break;
+					}
 				}
 			}
 		}

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c	2013-07-18 05:35:00 UTC (rev 58359)
@@ -577,7 +577,7 @@
 }
 
 /* Calculate the extents of F-Curve's keyframes */
-void calc_fcurve_range(FCurve *fcu, float *start, float *end,
+bool calc_fcurve_range(FCurve *fcu, float *start, float *end,
                        const short do_sel_only, const short do_min_length)
 {
 	float min = 999999999.0f, max = -999999999.0f;
@@ -621,6 +621,8 @@
 
 	*start = min;
 	*end = max;
+
+	return foundvert;
 }
 
 /* ----------------- Status Checks -------------------------- */

Modified: branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureImporter.cpp	2013-07-18 02:59:28 UTC (rev 58358)
+++ branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureImporter.cpp	2013-07-18 05:35:00 UTC (rev 58359)
@@ -133,24 +133,28 @@
 	add_v3_v3v3(bone->tail, bone->head, vec);
 
 	// set parent tail
-	if (parent && totchild == 1) {
-		copy_v3_v3(parent->tail, bone->head);
+	if (parent) {
 
-		// not setting BONE_CONNECTED because this would lock child bone location with respect to parent
-		bone->flag |= BONE_CONNECTED;
-
 		// XXX increase this to prevent "very" small bones?
 		const float epsilon = 0.000001f;
 
 		// derive leaf bone length
-		float length = len_v3v3(parent->head, parent->tail);
+		float length = len_v3v3(parent->head, bone->head);
 		if ((length < leaf_bone_length || totbone == 0) && length > epsilon) {
 			leaf_bone_length = length;
 		}
 
-		// treat zero-sized bone like a leaf bone
-		if (length <= epsilon) {
-			add_leaf_bone(parent_mat, parent, node);
+		if (totchild == 1) {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list