[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36611] branches/bmesh/blender: more syncing with trunk.
Campbell Barton
ideasman42 at gmail.com
Wed May 11 11:31:01 CEST 2011
Revision: 36611
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36611
Author: campbellbarton
Date: 2011-05-11 09:31:00 +0000 (Wed, 11 May 2011)
Log Message:
-----------
more syncing with trunk.
Modified Paths:
--------------
branches/bmesh/blender/intern/ghost/intern/GHOST_Event.h
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/space_api/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/SConscript
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_Event.h
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_Event.h 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_Event.h 2011-05-11 09:31:00 UTC (rev 36611)
@@ -36,14 +36,6 @@
#include "GHOST_IEvent.h"
-/* INTEGER CODES */
-#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- /* Big Endian */
-#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
-#else
- /* Little Endian */
-#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
-#endif
/**
* Base class for events received the operating system.
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -57,7 +57,6 @@
#include "DNA_lattice_types.h"
#include "DNA_scene_types.h"
#include "DNA_text_types.h"
-#include "DNA_windowmanager_types.h"
#include "BKE_action.h"
@@ -2540,9 +2539,9 @@
}
break;
default:
- {
- unit_m3(totmat);
- }
+ {
+ unit_m3(totmat);
+ }
break;
}
/* Block to keep matrix heading */
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -306,8 +306,7 @@
{
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
- if (scene)
- md->scene= scene;
+ md->scene= scene;
if((md->mode & required_mode) != required_mode) return 0;
if(mti->isDisabled && mti->isDisabled(md, required_mode == eModifierMode_Render)) return 0;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -44,7 +44,6 @@
#include "DNA_meshdata_types.h"
#include "DNA_mesh_types.h"
#include "DNA_scene_types.h"
-#include "DNA_windowmanager_types.h"
#include "BLI_editVert.h"
#include "BLI_math.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -533,7 +533,7 @@
for(i = 0; i < totedge; i++, me++) {
CCGEdge *e;
float crease;
-
+
crease = useFlatSubdiv ? creaseFactor :
me->crease * creaseFactor / 255.0f;
@@ -1525,6 +1525,7 @@
int step = (fast)? gridSize-1: 1;
ccgdm_pbvh_update(ccgdm);
+
if(ccgdm->pbvh && ccgdm->multires.mmd && !fast) {
if(dm->numFaceData) {
/* should be per face */
@@ -1539,8 +1540,6 @@
return;
}
- gridSize = ccgSubSurf_getGridSize(ss);
-
fi = ccgSubSurf_getFaceIterator(ss);
for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) {
CCGFace *f = ccgFaceIterator_getCurrent(fi);
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -3460,20 +3460,20 @@
return;
}
- for (i=0; i<count; i++) {
- void *tmp;
-
- mdverts[i].dw=newdataadr(fd, mdverts[i].dw);
-
+ for (i= count; i > 0; i--, mdverts++) {
/*convert to vgroup allocation system*/
- if (mdverts[i].dw) {
- tmp = BLI_cellalloc_malloc(MEM_allocN_len(mdverts[i].dw), "vgroups from readfile.c");
- memcpy(tmp, mdverts[i].dw, MEM_allocN_len(mdverts[i].dw));
-
- MEM_freeN(mdverts[i].dw);
- mdverts[i].dw = tmp;
- } else
- mdverts[i].totweight=0;
+ MDeformWeight *dw;
+ if(mdverts->dw && (dw= newdataadr(fd, mdverts->dw))) {
+ const ssize_t dw_len= mdverts->totweight * sizeof(MDeformWeight);
+ void *dw_tmp= BLI_cellalloc_malloc(dw_len, "direct_link_dverts");
+ memcpy(dw_tmp, dw, dw_len);
+ mdverts->dw= dw_tmp;
+ MEM_freeN(dw);
+ }
+ else {
+ mdverts->dw= NULL;
+ mdverts->totweight= 0;
+ }
}
}
Modified: branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/writefile.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/blenloader/intern/writefile.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -1122,17 +1122,17 @@
of library blocks that implement this.*/
IDP_WriteProperty(data->prop, wd);
}
- break;
+ break;
case CONSTRAINT_TYPE_SPLINEIK:
{
bSplineIKConstraint *data= (bSplineIKConstraint*)con->data;
/* write points array */
writedata(wd, DATA, sizeof(float)*(data->numpoints), data->points);
+ }
+ break;
}
- break;
}
- }
/* Write the constraint */
writestruct(wd, DATA, "bConstraint", 1, con);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -36,7 +36,6 @@
#include "BLI_array.h"
#include "DNA_object_types.h"
-#include "DNA_windowmanager_types.h"
#include "ED_mesh.h"
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -10,7 +10,6 @@
#include "DNA_key_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "DNA_windowmanager_types.h"
#include "BKE_customdata.h"
#include "BKE_mesh.h"
Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -4,7 +4,6 @@
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "DNA_windowmanager_types.h"
#include "BLI_utildefines.h"
Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -37,7 +37,6 @@
#include "BLI_utildefines.h"
#include "DNA_object_types.h"
-#include "DNA_windowmanager_types.h"
#include "ED_mesh.h"
Modified: branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -50,7 +50,6 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_gpencil_types.h"
-#include "DNA_windowmanager_types.h"
#include "UI_view2d.h"
Modified: branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h 2011-05-11 09:31:00 UTC (rev 36611)
@@ -40,6 +40,10 @@
struct Scene;
struct bContext;
struct wmKeyConfig;
+struct BMEditMesh;
+struct BMLoop;
+struct BMFace;
+struct MTexPoly;
/* uvedit_ops.c */
void ED_operatortypes_uvedit(void);
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -45,7 +45,6 @@
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_key_types.h"
-#include "DNA_windowmanager_types.h"
#include "RNA_types.h"
#include "RNA_define.h"
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ -45,7 +45,6 @@
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_key_types.h"
-#include "DNA_windowmanager_types.h"
#include "RNA_types.h"
#include "RNA_define.h"
Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c 2011-05-11 09:28:00 UTC (rev 36610)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c 2011-05-11 09:31:00 UTC (rev 36611)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list