[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46828] branches/soc-2012-fried_chicken: svn merge ^/trunk/blender -r46037:46827

Campbell Barton ideasman42 at gmail.com
Mon May 21 08:39:03 CEST 2012


Revision: 46828
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46828
Author:   campbellbarton
Date:     2012-05-21 06:39:03 +0000 (Mon, 21 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46037:46827

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

Modified Paths:
--------------
    branches/soc-2012-fried_chicken/intern/elbeem/CMakeLists.txt
    branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2012-fried_chicken/source/blender/avi/intern/avi.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/blender.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/customdata.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/displist.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/font.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/key.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mesh.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/object.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/ocean.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/particle.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/smoke.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/softbody.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/text.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/texture.c
    branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2012-fried_chicken/source/blender/blenlib/intern/path_util.c
    branches/soc-2012-fried_chicken/source/blender/blenlib/intern/pbvh.c
    branches/soc-2012-fried_chicken/source/blender/blenlib/intern/string.c
    branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
    branches/soc-2012-fried_chicken/source/blender/blenloader/intern/versioning_250.c
    branches/soc-2012-fried_chicken/source/blender/blenloader/intern/versioning_legacy.c
    branches/soc-2012-fried_chicken/source/blender/blenloader/intern/writefile.c
    branches/soc-2012-fried_chicken/source/blender/bmesh/bmesh.h
    branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/soc-2012-fried_chicken/source/blender/editors/armature/editarmature.c
    branches/soc-2012-fried_chicken/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2012-fried_chicken/source/blender/editors/armature/reeb.c
    branches/soc-2012-fried_chicken/source/blender/editors/curve/editcurve.c
    branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_draw.c
    branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_handlers.c
    branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_widgets.c
    branches/soc-2012-fried_chicken/source/blender/editors/mesh/editface.c
    branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2012-fried_chicken/source/blender/editors/object/object_modifier.c
    branches/soc-2012-fried_chicken/source/blender/editors/object/object_select.c
    branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_file/filesel.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_image/image_ops.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_logic/logic_window.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_text/text_draw.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.c
    branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_conversions.c
    branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_input.c
    branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_snap.c
    branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2012-fried_chicken/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2012-fried_chicken/source/blender/gpu/intern/gpu_material.c
    branches/soc-2012-fried_chicken/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2012-fried_chicken/source/blender/imbuf/intern/filter.c
    branches/soc-2012-fried_chicken/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2012-fried_chicken/source/blender/imbuf/intern/tiff.c
    branches/soc-2012-fried_chicken/source/blender/imbuf/intern/util.c
    branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_object_types.h
    branches/soc-2012-fried_chicken/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2012-fried_chicken/source/blender/makesdna/intern/makesdna.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/makesrna.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_access.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2012-fried_chicken/source/blender/python/generic/idprop_py_api.c
    branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_library.c
    branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_operator.c
    branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_rna.c
    branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2012-fried_chicken/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2012-fried_chicken/source/blender/render/intern/source/pipeline.c
    branches/soc-2012-fried_chicken/source/blender/render/intern/source/render_texture.c
    branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2012-fried_chicken/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2012-fried_chicken/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_Spatial.cpp

Property Changed:
----------------
    branches/soc-2012-fried_chicken/
    branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
    branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/


Property changes on: branches/soc-2012-fried_chicken
___________________________________________________________________
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
   + /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
/trunk/blender:46807-46827

Modified: branches/soc-2012-fried_chicken/intern/elbeem/CMakeLists.txt
===================================================================
--- branches/soc-2012-fried_chicken/intern/elbeem/CMakeLists.txt	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/intern/elbeem/CMakeLists.txt	2012-05-21 06:39:03 UTC (rev 46828)
@@ -86,9 +86,12 @@
 	intern/solver_interface.h
 	intern/solver_relax.h
 	intern/utilities.h
-    intern/globals.h
+	intern/globals.h
 )
 
+# elbeem has some harmless UNUSED warnings
+remove_strict_flags()
+
 add_definitions(
 	-DNOGUI
 	-DELBEEM_BLENDER=1

Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_info.py	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_info.py	2012-05-21 06:39:03 UTC (rev 46828)
@@ -156,7 +156,7 @@
 
     def draw(self, context):
         if hasattr(bpy.types, "WM_OT_collada_import"):
-            self.layout.operator("wm.collada_import", text="COLLADA (.dae)")
+            self.layout.operator("wm.collada_import", text="Collada (Default) (.dae)")
 
 
 class INFO_MT_file_export(Menu):
@@ -165,7 +165,7 @@
 
     def draw(self, context):
         if hasattr(bpy.types, "WM_OT_collada_export"):
-            self.layout.operator("wm.collada_export", text="COLLADA (.dae)")
+            self.layout.operator("wm.collada_export", text="Collada (Default) (.dae)")
 
 
 class INFO_MT_file_external_data(Menu):

Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_sequencer.py	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_sequencer.py	2012-05-21 06:39:03 UTC (rev 46828)
@@ -153,7 +153,7 @@
         layout.operator_menu_enum("sequencer.select_grouped", "type", text="Grouped")
         layout.operator("sequencer.select_linked")
         layout.operator("sequencer.select_all").action = 'TOGGLE'
-        layout.operator("sequencer.select_all", text="Invert Selection").action = 'INVERT'
+        layout.operator("sequencer.select_all", text="Inverse").action = 'INVERT'
 
 
 class SEQUENCER_MT_marker(Menu):
@@ -397,7 +397,7 @@
         if elem and elem.orig_width > 0 and elem.orig_height > 0:
             col.label(text="Original Dimension" + ": %dx%d" % (elem.orig_width, elem.orig_height))
         else:
-            col.label(text="Orig Dim: None")
+            col.label(text="Original Dimension: None")
 
 
 class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):

Modified: branches/soc-2012-fried_chicken/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/avi/intern/avi.c	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/source/blender/avi/intern/avi.c	2012-05-21 06:39:03 UTC (rev 46828)
@@ -215,7 +215,8 @@
 
 	if (GET_FCC(fp) != FCC("RIFF") ||
 	    !GET_FCC(fp) ||
-	    GET_FCC(fp) != FCC("AVI ")) {
+	    GET_FCC(fp) != FCC("AVI "))
+	{
 		ret = 0;
 	}
 	else {
@@ -245,7 +246,8 @@
 		return 0;
 
 	if (GET_FCC(movie.fp) != FCC("RIFF") ||
-	    !(movie.size = GET_FCC(movie.fp))) {
+	    !(movie.size = GET_FCC(movie.fp)))
+	{
 		fclose(movie.fp);
 		return 0;
 	}
@@ -257,7 +259,8 @@
 	    !GET_FCC(movie.fp) ||
 	    GET_FCC(movie.fp) != FCC("hdrl") ||
 	    (movie.header->fcc = GET_FCC(movie.fp)) != FCC("avih") ||
-	    !(movie.header->size = GET_FCC(movie.fp))) {
+	    !(movie.header->size = GET_FCC(movie.fp)))
+	{
 		DEBUG_PRINT("bad initial header info\n");
 		fclose(movie.fp);
 		return 0;
@@ -378,8 +381,7 @@
 				
 				fcca = bi->Compression;
 
-				if (movie.streams[temp].format ==
-				    AVI_FORMAT_AVI_RGB) {
+				if (movie.streams[temp].format == AVI_FORMAT_AVI_RGB) {
 					if (fcca == FCC("DIB ") ||
 					    fcca == FCC("RGB ") ||
 					    fcca == FCC("rgb ") ||
@@ -829,8 +831,8 @@
 		if (movie->streams[i].sh.Type == FCC("vids")) {	
 #if 0
 			if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
-				movie->streams[i].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader)
-				                                   + sizeof(AviMJPEGUnknown), "moviestreamformatL");
+				movie->streams[i].sf = MEM_mallocN(sizeof(AviBitmapInfoHeader) +
+				                                   sizeof(AviMJPEGUnknown), "moviestreamformatL");
 				movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown);
 			}
 			else {

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/CCGSubSurf.c	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/CCGSubSurf.c	2012-05-21 06:39:03 UTC (rev 46828)
@@ -1166,7 +1166,8 @@
 			v->flags = Vert_eEffected | seamflag;
 		}
 		else if (!VertDataEqual(vertData, _vert_getCo(v, 0, ss->meshIFC.vertDataSize), ss) ||
-		         ((v->flags & Vert_eSeam) != seamflag)) {
+		         ((v->flags & Vert_eSeam) != seamflag))
+		{
 			*prevp = v->next;
 			_ehash_insert(ss->vMap, (EHEntry *) v);
 			VertDataCopy(_vert_getCo(v, 0, ss->meshIFC.vertDataSize), vertData, ss);

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/DerivedMesh.c	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/DerivedMesh.c	2012-05-21 06:39:03 UTC (rev 46828)
@@ -1546,7 +1546,7 @@
 
 			/* if this is not the last modifier in the stack then recalculate the normals
 			 * to avoid giving bogus normals to the next modifier see: [#23673] */
-			if (isPrevDeform &&  mti->dependsOnNormals && mti->dependsOnNormals(md)) {
+			if (isPrevDeform && mti->dependsOnNormals && mti->dependsOnNormals(md)) {
 				/* XXX, this covers bug #23673, but we may need normal calc for other types */
 				if (dm && dm->type == DM_TYPE_CDDM) {
 					CDDM_apply_vert_coords(dm, deformedVerts);
@@ -2942,7 +2942,7 @@
 #endif
 
 	glDisable(GL_LIGHTING);
-	/*  if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high priority - campbell */
+	/* if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high priority - campbell */
 		DEBUG_VBO("Using legacy code. drawNavMeshColored\n");
 		//glShadeModel(GL_SMOOTH);
 		glBegin(glmode = GL_QUADS);

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/blender.c	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/blender.c	2012-05-21 06:39:03 UTC (rev 46828)
@@ -334,7 +334,8 @@
 {
 	if (main->minversionfile > BLENDER_VERSION ||
 	    (main->minversionfile == BLENDER_VERSION &&
-	     main->minsubversionfile > BLENDER_SUBVERSION)) {
+	     main->minsubversionfile > BLENDER_SUBVERSION))
+	{
 		BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);
 	}
 

Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/cdderivedmesh.c	2012-05-21 06:37:28 UTC (rev 46827)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/cdderivedmesh.c	2012-05-21 06:39:03 UTC (rev 46828)
@@ -640,9 +640,8 @@
 					if (drawParamsMapped)       { draw_option = drawParamsMapped(userData, orig); }
 					else                        { if (nors) nors += 3; continue; }
 				}
-				else
-				if (drawParamsMapped) draw_option = drawParamsMapped(userData, i);
-				else {    if (nors) nors += 3; continue; }
+				else if (drawParamsMapped) { draw_option = drawParamsMapped(userData, i); }
+				else                       { if (nors) nors += 3; continue; }
 			}
 			
 			if (draw_option != DM_DRAW_OPTION_SKIP) {
@@ -2397,11 +2396,13 @@
 	CustomData_add_layer(&edgeData, CD_MEDGE, CD_CALLOC, NULL, numEdges);
 	CustomData_add_layer(&edgeData, CD_ORIGINDEX, CD_CALLOC, NULL, numEdges);
 
-	ehi = BLI_edgehashIterator_new(eh);
 	med = CustomData_get_layer(&edgeData, CD_MEDGE);
 	index = CustomData_get_layer(&edgeData, CD_ORIGINDEX);
-	for (i = 0; !BLI_edgehashIterator_isDone(ehi);
-	     BLI_edgehashIterator_step(ehi), ++i, ++med, ++index) {
+
+	for (ehi = BLI_edgehashIterator_new(eh), i = 0;
+	     BLI_edgehashIterator_isDone(ehi) == FALSE;
+	     BLI_edgehashIterator_step(ehi), ++i, ++med, ++index)
+	{

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list