[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56752] branches/soc-2011-tomato: Merging r56732 through r56751 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Mon May 13 11:21:11 CEST 2013


Revision: 56752
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56752
Author:   nazgul
Date:     2013-05-13 09:21:11 +0000 (Mon, 13 May 2013)
Log Message:
-----------
Merging r56732 through r56751 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/libmv-capi.cc
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.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-56731
   + /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-56751

Modified: branches/soc-2011-tomato/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv-capi.cc	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/extern/libmv/libmv-capi.cc	2013-05-13 09:21:11 UTC (rev 56752)
@@ -24,6 +24,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifdef WITH_LIBMV
+
 /* define this to generate PNG images with content of search areas
    tracking between which failed */
 #undef DUMP_FAILURE
@@ -1058,3 +1060,5 @@
 		camera_intrinsics.InvertIntrinsics(x, y, x1, y1);
 	}
 }
+
+#endif

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h	2013-05-13 09:21:11 UTC (rev 56752)
@@ -83,7 +83,7 @@
 void BKE_curve_editNurb_free(struct Curve *cu);
 struct ListBase *BKE_curve_editNurbs_get(struct Curve *cu);
 
-float *BKE_curve_make_orco(struct Scene *scene, struct Object *ob);
+float *BKE_curve_make_orco(struct Scene *scene, struct Object *ob, int *r_numVerts);
 float *BKE_curve_surf_make_orco(struct Object *ob);
 
 void BKE_curve_bevelList_make(struct Object *ob);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -1328,7 +1328,7 @@
 /* NOTE: This routine is tied to the order of vertex
  * built by displist and as passed to the renderer.
  */
-float *BKE_curve_make_orco(Scene *scene, Object *ob)
+float *BKE_curve_make_orco(Scene *scene, Object *ob, int *r_numVerts)
 {
 	Curve *cu = ob->data;
 	DispList *dl;
@@ -1358,6 +1358,9 @@
 		}
 	}
 
+	if (r_numVerts)
+		*r_numVerts = numVerts;
+
 	fp = coord_array = MEM_mallocN(3 * sizeof(float) * numVerts, "cu_orco");
 	for (dl = disp.first; dl; dl = dl->next) {
 		if (dl->type == DL_INDEX3) {

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -1102,7 +1102,13 @@
 			dm->getVertCos(dm, orco);
 	}
 	else {
-		orco = (float(*)[3])BKE_curve_make_orco(scene, ob);
+		int totvert_curve;
+		orco = (float(*)[3])BKE_curve_make_orco(scene, ob, &totvert_curve);
+		if (totvert != totvert_curve) {
+			MEM_freeN(orco);
+			orco = MEM_callocN(sizeof(float) * 3 * totvert, "dm orco");
+			dm->getVertCos(dm, orco);
+		}
 	}
 
 	for (a = 0; a < totvert; a++) {

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -388,17 +388,17 @@
 	/* Convert the corners into search space coordinates. */
 	for (i = 0; i < 4; i++) {
 		marker_unified_to_search_pixel(frame_width, frame_height, marker, marker->pattern_corners[i], pixel_coords);
-		search_pixel_x[i] = pixel_coords[0] - 0.5;
-		search_pixel_y[i] = pixel_coords[1] - 0.5;
+		search_pixel_x[i] = pixel_coords[0] - 0.5f;
+		search_pixel_y[i] = pixel_coords[1] - 0.5f;
 	}
 
 	/* Convert the center position (aka "pos"); this is the origin */
-	unified_coords[0] = 0.0;
-	unified_coords[1] = 0.0;
+	unified_coords[0] = 0.0f;
+	unified_coords[1] = 0.0f;
 	marker_unified_to_search_pixel(frame_width, frame_height, marker, unified_coords, pixel_coords);
 
-	search_pixel_x[4] = pixel_coords[0] - 0.5;
-	search_pixel_y[4] = pixel_coords[1] - 0.5;
+	search_pixel_x[4] = pixel_coords[0] - 0.5f;
+	search_pixel_y[4] = pixel_coords[1] - 0.5f;
 }
 
 /* Inverse of above. */

Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -253,7 +253,7 @@
 
 		/* temporary #if until we update all libraries to 1.2.7
 		 * for  correct wide char path handling */
-#if ZLIB_VERNUM >= 0x1270
+#if ZLIB_VERNUM >= 0x1270 && !defined(FREE_WINDOWS)
 		UTF16_ENCODE(filename);
 
 		gzfile = gzopen_w(filename_16, mode);

Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/string_cursor_utf8.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/string_cursor_utf8.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/string_cursor_utf8.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -118,8 +118,8 @@
 	const char *str_next = BLI_str_find_next_char_utf8(str_pos, str_end);
 	if (str_next) {
 		(*pos) += (str_next - str_pos);
-		if ((*pos) > maxlen) {
-			(*pos) = maxlen;
+		if ((*pos) > (int)maxlen) {
+			(*pos) = (int)maxlen;
 		}
 		return TRUE;
 	}

Modified: branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -359,6 +359,7 @@
 	 * stack (if we use simple function recursion, we'd end up overloading
 	 * the stack on large meshes). */
 
+	STACK_INIT(fstack);
 	STACK_PUSH(fstack, startf);
 	BMO_elem_flag_enable(bm, startf, FACE_VIS);
 

Modified: branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h	2013-05-13 09:21:11 UTC (rev 56752)
@@ -149,7 +149,7 @@
 #define UI_TEXT_RIGHT       1024
 #define UI_BUT_NODE_LINK    2048
 #define UI_BUT_NODE_ACTIVE  4096
-#define UI_FLAG_UNUSED      8192
+#define UI_BUT_DRAG_LOCK    8192
 
 /* button align flag, for drawing groups together */
 #define UI_BUT_ALIGN        (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT | UI_BUT_ALIGN_DOWN)


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-56731
   + /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-56751

Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c	2013-05-13 07:50:26 UTC (rev 56751)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c	2013-05-13 09:21:11 UTC (rev 56752)
@@ -756,6 +756,7 @@
 
 typedef struct uiDragToggleHandle {
 	/* init */
+	bool is_init;
 	bool is_set;
 	float but_cent_start[2];
 	eButType but_type_start;
@@ -767,6 +768,8 @@
 static bool ui_drag_toggle_set_xy_xy(bContext *C, ARegion *ar, const bool is_set, const eButType but_type_start,
                                      const int xy_src[2], const int xy_dst[2])
 {
+	/* popups such as layers won't re-evaluate on redraw */
+	const bool do_check = (ar->regiontype == RGN_TYPE_TEMPORARY);
 	bool change = false;
 	uiBlock *block;
 
@@ -790,6 +793,9 @@
 						BLI_assert(ui_is_but_bool(but) == true);
 						if (is_set_but != is_set) {
 							uiButExecute(C, but);
+							if (do_check) {
+								ui_check_but(but);
+							}
 							change = true;
 						}
 					}
@@ -815,24 +821,31 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list