svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 03:55:23 +0000 (03:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 03:55:23 +0000 (03:55 +0000)
39 files changed:
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/object_bake.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_util.h
source/blender/python/mathutils/mathutils.c
source/blender/python/mathutils/mathutils.h
source/blender/python/mathutils/mathutils_Color.c
source/blender/python/mathutils/mathutils_Color.h
source/blender/python/mathutils/mathutils_Euler.c
source/blender/python/mathutils/mathutils_Euler.h
source/blender/python/mathutils/mathutils_Matrix.c
source/blender/python/mathutils/mathutils_Matrix.h
source/blender/python/mathutils/mathutils_Quaternion.c
source/blender/python/mathutils/mathutils_Quaternion.h
source/blender/python/mathutils/mathutils_Vector.c
source/blender/python/mathutils/mathutils_Vector.h
source/blender/python/mathutils/mathutils_geometry.c
source/blender/python/mathutils/mathutils_geometry.h
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index 717e5e06f7de882f624146a80599f4248d3d44ef,9a384c40e24e02e1364ae35dee3bd03a1e6c73ff..dc8706f151cc9a3c74bc15867826fe9f3622e773
@@@ -39,12 -41,10 +41,11 @@@ set(IN
        ../imbuf
        ../makesdna
        ../makesrna
 +      ../bmesh
        ../modifiers
        ../nodes
-       ../editors/include
        ../render/extern/include
-       ../../../intern/bsp/extern ../blenfont
+       ../../../intern/bsp/extern
        ../../../intern/decimation/extern
        ../../../intern/elbeem/extern
        ../../../intern/guardedalloc
Simple merge
index 6095de2c105d98368a0c24f2d28641356be1faa3,02a25a2a122740896449461eb9a8f17a585379e0..aff5f69e9d555c3da65ff63c8172cd22bf95abd9
  
  set(INC
        ../include
 +      ../uvedit
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../imbuf
        ../../makesdna
        ../../makesrna
index d370e0362294c4dc0630bdc2f8115e7d30eab4c1,14b40d55f11ad4095e06fdb039803276b50c5cfd..58496a914cb8b418178bdfb160bf61fb937edc62
@@@ -22,9 -22,8 +22,9 @@@
  set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../gpu
        ../../ikplugin
        ../../imbuf
index 0daf73bebba2bc35c5a0064ba72e934a1505dac2,bdd911d68ee2ae8f473fefef62793e4a1effb9e6..b22536cc36873c23ef72f8a0c636295c51b8808b
@@@ -1010,11 -966,12 +1010,12 @@@ static DerivedMesh *multiresbake_create
        MultiresModifierData *mmd= get_multires_modifier(scene, ob, 0);
        Mesh *me= (Mesh*)ob->data;
  
-       *lvl= mmd->lvl;
+       if(ob->mode==OB_MODE_SCULPT) *lvl= mmd->sculptlvl;
+       else *lvl= mmd->lvl;
  
-       if(mmd->lvl==0) {
+       if(*lvl==0) {
                DerivedMesh *tmp_dm= CDDM_from_mesh(me, ob);
 -              dm= CDDM_copy(tmp_dm);
 +              dm= CDDM_copy(tmp_dm, 0);
                tmp_dm->release(tmp_dm);
        } else {
                MultiresModifierData tmp_mmd= *mmd;
index a6638a7feab93500488c9ef3a092e4d3f245b8a8,4282110901b91cb392c165619109a1569f6970d9..aa347961dcb96b02d4c5419e634c985b40a53692
@@@ -23,9 -23,8 +23,9 @@@ set(IN
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 12361e790e491f816ca9d5457210af90cc7aba04,4cbb290be765393a08dfd8999fec65373f724bd9..bb9b85c5f30cc25b907e34eedf0edf838051fb3e
@@@ -22,9 -22,8 +22,9 @@@
  set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 8e2836388cbec2b3d62461006de697592a05e74e,0d4408faf49dc966bdc6249891c3a2f08085941b..d811f0186188d467dd90b1b11652140d73a0f2b5
@@@ -23,14 -23,13 +23,14 @@@ set(IN
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
  )
  
index 7f4b370c37127a6a8e717d4919d9766a98df2bf6,22347df93a32ee158d758b9417799cf9bc0907bd..1930fb6bcc8e87d816abb17e85cbcb4f144b6134
@@@ -23,10 -23,9 +23,10 @@@ set(IN
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 9f9395b1284d71d1628f05b3c060ffb300a5edc7,c6e936606c86b3af661a460080c619e463ba9b44..53b23cc7c5392e34c61165654c52b09571f86d64
@@@ -23,9 -23,8 +23,9 @@@ set(IN
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../gpu
        ../../imbuf
        ../../makesdna
index 9de130bb99cd30aa053f571068aa37c6866c7512,283b09f42e4fcd11dfdbab42e32ab28b9b37cde1..c0a1a6a29f40ec2e4b637ad6ee8b28f5680c3ef3
@@@ -22,9 -22,8 +22,9 @@@
  set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index f9fbd0a9c1281dccd6f18d80f5dc95eb13ecb2bf,72f13c14f5dfabbf0ffffbcab605702228384427..e39e3e873992972cf5ba80c29a537936ca1b9dc6
@@@ -22,9 -22,8 +22,9 @@@
  set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 84cdb6a0f71777298b6ebf2dff74a3d6388df047,552e1b60154ce4a49cf46f409d9643bd706cc6fe..1fe2e014a7508428e8f0beccb1ffc0a8d7ec62ec
@@@ -22,9 -22,8 +22,9 @@@
  set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index f71fd11877f330f79fdabda659a6f7c34c0e4a26,d1f153265acfdbfc295f7b99cb381c9380cb319a..1097b238cae8b47bee7a2dd4478bfbfb39bb796e
@@@ -29,12 -32,9 +32,10 @@@ set(IN
        ../blenlib
        ../blenloader
        ../makesdna
-       ../blenkernel
-       ../blenkernel/intern
 +      ../bmesh
        ../render/extern/include
-       ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
+       ../../../intern/guardedalloc
  )
  
  set(INC_SYS
index 07d0ed37d3d274b1c2298ded4b3028899d38597e,5e6f377acf19e2ac53ca251e7eae391ad03ed306..c89043ea0c3a494e81a8f8547046576fb9e88243
@@@ -50,8 -50,8 +50,8 @@@ void get_texture_value(struct Tex *text
  void get_texture_coords(struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm, float (*co)[3], float (*texco)[3], int numVerts);
  void modifier_vgroup_cache(struct ModifierData *md, float (*vertexCos)[3]);
  void validate_layer_name(const struct CustomData *data, int type, char *name, char *outname);
 -struct DerivedMesh *get_cddm(struct Object *ob, struct EditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3]);
 -struct DerivedMesh *get_dm(struct Object *ob, struct EditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3], int orco);
 +struct DerivedMesh *get_cddm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3]);
 +struct DerivedMesh *get_dm(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3], int orco);
- void modifier_get_vgroup(struct Object *ob, DerivedMesh *dm, const char *name, struct MDeformVert **dvert, int *defgrp_index);
+ void modifier_get_vgroup(struct Object *ob, struct DerivedMesh *dm, const char *name, struct MDeformVert **dvert, int *defgrp_index);
  
  #endif /* MOD_UTIL_H */
index 1ff33d5a6bb6b73ed462b677d3b5602bf81698d3,50b75b09cb2c2c7b172c823e39f8ad1a68e3a4a8..4a0fa509a0d140aa5404dc16659fe6d66995a080
@@@ -1,5 -1,5 +1,5 @@@
  /* 
-- * $Id$
++ * $Id: mathutils.c 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 449708d1ac1e7fffef8536be85d25fef216959d3,7454cfe78b3de481e0df632f7a5e04d1c9b0d67a..90ef768c3ec56c9f98386320ca946beb382f5b5c
@@@ -1,5 -1,5 +1,5 @@@
  /* 
-- * $Id$
++ * $Id: mathutils.h 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index d0c7ec72cea33815e5e3a3bff5709e2ee2506551,d0c7ec72cea33815e5e3a3bff5709e2ee2506551..37730ba46497ff19058167a9070d7d8ace9a74f0
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Color.c 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 0fc880363f478a0136477d3cd38eb93ff5fa5d11,0fc880363f478a0136477d3cd38eb93ff5fa5d11..0afb0ee4dc19151579cf7cd8493ee34f5edf9779
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Color.h 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index a7d6d921d166f04ac2b59aa08852df536bab0458,5c609d8961fea5d51682aaafab5f37a442567fb9..afff9275aa031b4c0852341d851fa7c102d3dbb2
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Euler.c 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 849e16c2bb7b33f4bff8f79128c2a11cc092198d,849e16c2bb7b33f4bff8f79128c2a11cc092198d..2df3d6198b8591d6e3fa3527bd498ef30ab36dc8
@@@ -1,5 -1,5 +1,5 @@@
  /* 
-- * $Id$
++ * $Id: mathutils_Euler.h 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index c5ed1e32ee8174fde195b9b98591d8409f97f9bb,b0187c1ef2558c6f24c47fa93e54b713df1932d6..d0483fbf3dfc27576c68310534189c35f2f9480a
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Matrix.c 38527 2011-07-20 06:41:51Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
@@@ -1588,31 -1587,31 +1587,25 @@@ static PyObject *Matrix_mul(PyObject *m
  
        if(mat1 && mat2) {
                /*MATRIX * MATRIX*/
--              if(mat1->row_size != mat2->col_size){
++              if(mat2->row_size != mat1->col_size){
                        PyErr_SetString(PyExc_ValueError,
                                        "Matrix multiplication: "
                                        "matrix A rowsize must equal matrix B colsize");
                        return NULL;
                }
                else {
--                      float mat[16]= {0.0f, 0.0f, 0.0f, 0.0f,
--                                                      0.0f, 0.0f, 0.0f, 0.0f,
--                                                      0.0f, 0.0f, 0.0f, 0.0f,
--                                                      0.0f, 0.0f, 0.0f, 1.0f};
--                      double dot = 0.0f;
++                      float mat[16]= {0.0f};
                        int x, y, z;
  
                        for(x = 0; x < mat2->row_size; x++) {
                                for(y = 0; y < mat1->col_size; y++) {
                                        for(z = 0; z < mat1->row_size; z++) {
--                                              dot += (mat1->matrix[z][y] * mat2->matrix[x][z]);
++                                              mat[x * mat2->col_size + y] += (mat2->matrix[x][z] * mat1->matrix[z][y]);
                                        }
--                                      mat[((x * mat1->col_size) + y)] = (float)dot;
--                                      dot = 0.0f;
                                }
                        }
  
--                      return newMatrixObject(mat, mat2->row_size, mat1->col_size, Py_NEW, Py_TYPE(mat1));
++                      return newMatrixObject(mat, mat1->row_size, mat2->col_size, Py_NEW, Py_TYPE(mat1));
                }
        }
        else if(mat2) {
index aa736d1e9592d261596343dbadc9df40cadd3b80,aa736d1e9592d261596343dbadc9df40cadd3b80..84a92bae2be44bb8d06d8da8b69c71bc3838a915
@@@ -1,5 -1,5 +1,5 @@@
  /* 
-- * $Id$
++ * $Id: mathutils_Matrix.h 38409 2011-07-15 04:01:47Z campbellbarton $
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
   * This program is free software; you can redistribute it and/or
index 3b05b9a250b91674c15d6f52019a9783b0a1b7bd,3b05b9a250b91674c15d6f52019a9783b0a1b7bd..62e2fb48103795fefe368728edae390a3f4252ee
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Quaternion.c 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index d606621390adde4f7f47b46c346c2d4ae0df37a9,d606621390adde4f7f47b46c346c2d4ae0df37a9..4ba708956809e4c4ff6b1b466fa14d981b8f697d
@@@ -1,5 -1,5 +1,5 @@@
  /* 
-- * $Id$
++ * $Id: mathutils_Quaternion.h 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index a834e8f2ba4b1d33dae73d606afc235f3ff5a195,e2c958adaa5a348b709988a58f95f01696a10165..e1a96f278d74c5678747e15c0fe91b02710e1ada
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Vector.c 38409 2011-07-15 04:01:47Z campbellbarton $
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
   * This program is free software; you can redistribute it and/or
index 0ede836ce443eb6de89b487260ac8c23f0c9f2e3,0ede836ce443eb6de89b487260ac8c23f0c9f2e3..e430a10083695ed1c144d79b50046859df6f8171
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_Vector.h 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index d2724f6603e76e6390ec71eda17b61d7f8736387,bcdfe020e1ab10e3d6585dc6bd8e6324ca177dfd..acfb8a91416d11a43ab0fa2de333f4dd4de2f91c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * $Id$
++ * $Id: mathutils_geometry.c 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
index 929b8cc8d75d7710a2c665259903b433b44eb00f,c963a63ce7fc75a8ac66e812e42c8956d43923b1..0b07fc12c6988de5582d23457c369c3f033e2401
@@@ -1,5 -1,5 +1,5 @@@
  /* 
-- * $Id$
++ * $Id: mathutils_geometry.h 38409 2011-07-15 04:01:47Z campbellbarton $
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
Simple merge
index 23884b925b2bb2bb8f3f44ed2c13cf8a799f13c1,43fec85b5bf6f28e64a15f7dc353e5465a43d640..a6b136021ce37f2b13ef119e88db67f14c0f2cc8
@@@ -768,8 -768,8 +768,9 @@@ endif(
                bf_intern_opennl
                bf_python
                bf_python_ext
+               bf_python_mathutils
                bf_ikplugin
 +              bf_bmesh
                bf_modifiers
                bf_blenkernel
                bf_nodes