[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39782] branches/bmesh/blender: svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Campbell Barton ideasman42 at gmail.com
Tue Aug 30 02:23:11 CEST 2011


Revision: 39782
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39782
Author:   campbellbarton
Date:     2011-08-30 00:23:11 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/bmesh/blender/source/gameengine/Converter/KX_ConvertControllers.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/editors/render/render_update.c
    branches/bmesh/blender/source/blender/editors/space_outliner/
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:31524-39765
   + /trunk/blender:31524-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39781


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39765
   + /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39781

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2011-08-29 17:55:14 UTC (rev 39781)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2011-08-30 00:23:11 UTC (rev 39782)
@@ -338,7 +338,8 @@
 							int (*setDrawOptions)(void *userData, int index,
 												  int *drawSmooth_r),
 							void *userData, int useColors,
-							int (*setMaterial)(int, void *attribs));
+							int (*setMaterial)(int, void *attribs),
+							int (*compareDrawOptions)(void *userData, int cur_index, int next_index));
 
 	/* Draw mapped faces using MTFace 
 	 *  o Drawing options too complicated to enumerate, look at code.

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-08-29 17:55:14 UTC (rev 39781)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-08-30 00:23:11 UTC (rev 39782)
@@ -874,7 +874,8 @@
 	cdDM_drawFacesTex_common(dm, setDrawOptions, NULL, NULL);
 }
 
-static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors, int (*setMaterial)(int, void *attribs))
+static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors, int (*setMaterial)(int, void *attribs),
+			int (*compareDrawOptions)(void *userData, int cur_index, int next_index))
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
 	MVert *mv = cddm->mvert;
@@ -991,6 +992,7 @@
 					MFace *mface= mf + actualFace;
 					int drawSmooth= (mface->flag & ME_SMOOTH);
 					int draw = 1;
+					int flush = 0;
 
 					if(i != tottri-1)
 						next_actualFace= dm->drawObject->triangle_to_mface[i+1];
@@ -1005,11 +1007,28 @@
 					/* Goal is to draw as long of a contiguous triangle
 					   array as possible, so draw when we hit either an
 					   invisible triangle or at the end of the array */
-					if(!draw || i == tottri - 1 || mf[actualFace].mat_nr != mf[next_actualFace].mat_nr) {
-						if(prevstart != i)
-							/* Add one to the length (via `draw')
-							   if we're drawing at the end of the array */
-							glDrawArrays(GL_TRIANGLES,prevstart*3, (i-prevstart+draw)*3);
+

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list