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

Gavin Howard gavin.d.howard at gmail.com
Sat Aug 3 08:57:03 CEST 2013


Revision: 58848
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58848
Author:   gdh
Date:     2013-08-03 06:57:03 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58817 to r58847.

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

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp
    branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_window.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_ActionManager.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/SceneGraph/SG_Tree.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/VideoTexture/BlendType.h
    branches/soc-2013-cycles_mblur/source/gameengine/VideoTexture/Exception.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/VideoTexture/FilterSource.h
    branches/soc-2013-cycles_mblur/source/gameengine/VideoTexture/ImageMix.h
    branches/soc-2013-cycles_mblur/source/gameengine/VideoTexture/ImageRender.cpp

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58816
   + /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
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58847

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c	2013-08-03 06:57:03 UTC (rev 58848)
@@ -3578,6 +3578,11 @@
 		cache->flag &= ~(PTCACHE_OUTDATED|PTCACHE_FRAMES_SKIPPED);
 	}
 
+	/* make sure all new frames are loaded */
+	if (cache->cached_frames) {
+		MEM_freeN(cache->cached_frames);
+		cache->cached_frames=NULL;
+	}
 	BKE_ptcache_update_info(pid);
 }
 

Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c	2013-08-03 06:57:03 UTC (rev 58848)
@@ -220,14 +220,15 @@
 
 	/* flag all edges of all input face */
 	BMO_ITER (f, &siter, op->slots_in, "faces", BM_FACE) {
-		BMO_elem_flag_enable(bm, f, FACE_INPUT);
+		if (f->len == 3) {
+			BMO_elem_flag_enable(bm, f, FACE_INPUT);
+		}
 	}
 
 	/* flag edges surrounded by 2 flagged triangles */
 	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		BMFace *f_a, *f_b;
 		if (BM_edge_face_pair(e, &f_a, &f_b) &&
-		    (f_a->len == 3 && f_b->len == 3) &&
 		    (BMO_elem_flag_test(bm, f_a, FACE_INPUT) && BMO_elem_flag_test(bm, f_b, FACE_INPUT)))
 		{
 			BMO_elem_flag_enable(bm, e, EDGE_MARK);
@@ -307,9 +308,11 @@
 			continue;
 
 		BM_edge_face_pair(e, &f_a, &f_b); /* checked above */
-		f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);
-		if (f_new) {
-			BMO_elem_flag_enable(bm, f_new, FACE_OUT);
+		if ((f_a->len == 3 && f_b->len == 3)) {
+			f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);
+			if (f_new) {
+				BMO_elem_flag_enable(bm, f_new, FACE_OUT);
+			}
 		}
 	}
 

Modified: branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp	2013-08-03 06:57:03 UTC (rev 58848)
@@ -618,13 +618,10 @@
 				set_poly_indices(mpoly, mloop, loop_index, position_indices, vcount);
 
 
-				for (unsigned int l = 0; l < index_list_array.getCount(); l++) {
-					int uvset_index = index_list_array[l]->getSetIndex();
-
+				for (unsigned int uvset_index = 0; uvset_index < index_list_array.getCount(); uvset_index++) {
 					// get mtface by face index and uv set index
 					MLoopUV  *mloopuv = (MLoopUV  *)CustomData_get_layer_n(&me->ldata, CD_MLOOPUV, uvset_index);
-
-					set_face_uv(mloopuv+loop_index, uvs, start_index, *index_list_array[l], vcount);
+					set_face_uv(mloopuv+loop_index, uvs, start_index, *index_list_array[uvset_index], vcount);
 				}
 
 				if (mp_has_normals) {

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_window.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_window.c	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_window.c	2013-08-03 06:57:03 UTC (rev 58848)
@@ -1009,8 +1009,6 @@
 	bSensor *sens = (bSensor *)ptr->data;
 	bArmatureSensor *as = (bArmatureSensor *) sens->data;
 	Object *ob = (Object *)ptr->id.data;
-	PointerRNA pose_ptr, pchan_ptr;
-	PropertyRNA *bones_prop= NULL;
 	uiLayout *row;
 
 	if (ob->type != OB_ARMATURE) {
@@ -1019,11 +1017,12 @@
 	}
 
 	if (ob->pose) {
+		PointerRNA pose_ptr, pchan_ptr;
+		PropertyRNA *bones_prop;
+
 		RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
 		bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
-	}
 
-	if (&pose_ptr.data) {
 		uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
 
 		if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, as->posechannel, &pchan_ptr))


Property changes on: branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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/source/blender/editors/space_outliner:57516
/trunk/blender/source/blender/editors/space_outliner:57388-58799
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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/source/blender/editors/space_outliner:57516
/trunk/blender/source/blender/editors/space_outliner:57388-58847

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tools.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tools.c	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tools.c	2013-08-03 06:57:03 UTC (rev 58848)
@@ -683,6 +683,10 @@
 		outliner_do_object_operation(C, scene, soops, &soops->tree, item_rename_cb);
 		str = "Rename Object";
 	}
+	else {
+		BLI_assert(0);
+		return OPERATOR_CANCELLED;
+	}
 
 	ED_undo_push(C, str);
 	

Modified: branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c	2013-08-03 06:57:03 UTC (rev 58848)
@@ -184,6 +184,7 @@
 		BKE_ptcache_load_external(pid);
 
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+		WM_main_add_notifier(NC_OBJECT | ND_POINTCACHE, ob);
 	}
 	else {
 		for (pid = pidlist.first; pid; pid = pid->next) {

Modified: branches/soc-2013-cycles_mblur/source/blender/render/intern/raytrace/rayobject_octree.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/render/intern/raytrace/rayobject_octree.cpp	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/blender/render/intern/raytrace/rayobject_octree.cpp	2013-08-03 06:57:03 UTC (rev 58848)
@@ -521,7 +521,7 @@
 	copy_v3_v3(co1, face->v1);
 	copy_v3_v3(co2, face->v2);
 	copy_v3_v3(co3, face->v3);
-	if (face->v4)
+	if (RE_rayface_isQuad(face))
 		copy_v3_v3(co4, face->v4);
 
 	for (c = 0; c < 3; c++) {

Modified: branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_ActionManager.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_ActionManager.cpp	2013-08-03 05:02:03 UTC (rev 58847)
+++ branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/BL_ActionManager.cpp	2013-08-03 06:57:03 UTC (rev 58848)
@@ -41,8 +41,6 @@
 float BL_ActionManager::GetActionFrame(short layer)
 {
 	return m_layers[layer]->GetFrame();
-
-	return 0.f;
 }
 
 void BL_ActionManager::SetActionFrame(short layer, float frame)
@@ -53,8 +51,6 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list