[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40892] trunk/blender/source: - for some reason navmesh wasnt drawing when VBO was enabled.

[Campbell Barton]

Revision: 40892
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40892
Author:   campbellbarton
Date:     2011-10-10 02:56:26 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
- for some reason navmesh wasnt drawing when VBO was enabled.
- fix navmesh crash (may well have been from own changes)
- changing VBO's now redraws all windows - useful for checking if VBO draws differently.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-10-10 01:14:49 UTC (rev 40891)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-10-10 02:56:26 UTC (rev 40892)
@@ -3001,7 +3001,7 @@
 	glEnable(GL_LIGHTING);*/
 
 	glDisable(GL_LIGHTING);
-	if(GPU_buffer_legacy(dm) ) {
+	/*  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);
@@ -3062,8 +3062,10 @@
 	result = CDDM_copy(dm);
 	if (!CustomData_has_layer(&result->faceData, CD_RECAST)) {
 		int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST);
-		CustomData_add_layer_named(&result->faceData, CD_RECAST, CD_DUPLICATE,
-			sourceRecastData, maxFaces, "recastData");
+		if (sourceRecastData) {
+			CustomData_add_layer_named(&result->faceData, CD_RECAST, CD_DUPLICATE,
+			                           sourceRecastData, maxFaces, "recastData");
+		}
 	}
 	recastData = (int*)CustomData_get_layer(&result->faceData, CD_RECAST);
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-10-10 01:14:49 UTC (rev 40891)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-10-10 02:56:26 UTC (rev 40892)
@@ -946,6 +946,7 @@
 
 	if (was_navmesh != (ob->gameflag & OB_NAVMESH)) {
 		if (ob->type == OB_MESH) {
+			/* this is needed to refresh the derived meshes draw func */
 			DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
 			WM_main_add_notifier(NC_OBJECT|ND_DRAW, ptr->id.data);
 		}
@@ -1424,8 +1425,7 @@
 	prop= RNA_def_property(srna, "physics_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "body_type");
 	RNA_def_property_enum_items(prop, body_type_items);
-	RNA_def_property_enum_funcs(prop, "rna_GameObjectSettings_physics_type_get",
-	                            "rna_GameObjectSettings_physics_type_set", NULL);
+	RNA_def_property_enum_funcs(prop, "rna_GameObjectSettings_physics_type_get", "rna_GameObjectSettings_physics_type_set", NULL);
 	RNA_def_property_ui_text(prop, "Physics Type",  "Selects the type of physical representation");
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2011-10-10 01:14:49 UTC (rev 40891)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2011-10-10 02:56:26 UTC (rev 40892)
@@ -2661,8 +2661,8 @@
 
 	prop= RNA_def_property(srna, "use_vertex_buffer_objects", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_VBO);
-	RNA_def_property_ui_text(prop, "VBOs",
-	                         "Use Vertex Buffer Objects (or Vertex Arrays, if unsupported) for viewport rendering");
+	RNA_def_property_ui_text(prop, "VBOs", "Use Vertex Buffer Objects (or Vertex Arrays, if unsupported) for viewport rendering");
+	RNA_def_property_update(prop, NC_WINDOW, NULL); /* this isnt essential but nice to check if VBO draws any differently */
 
 	prop= RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_AA);

Modified: trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp	2011-10-10 01:14:49 UTC (rev 40891)
+++ trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp	2011-10-10 02:56:26 UTC (rev 40892)
@@ -102,7 +102,7 @@
 		rotmode = "rotation_axis_angle";
 		drotmode = "delta_rotation_axis_angle";
 		break;
-	case ROT_MODE_QUAT:
+	case ROT_MODE_QUAT: /* XXX, this isnt working, currently only eulers are supported [#28853] */
 		rotmode = "rotation_quaternion";
 		drotmode = "delta_rotation_quaternion";
 		break;