svn merge -r 12294:12347 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Oct 2007 23:05:09 +0000 (23:05 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Oct 2007 23:05:09 +0000 (23:05 +0000)
1  2 
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/Makefile
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/intern/makesdna.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c

index 3403490b7789014b7a495f88eee26ba73a9cf884,9ecc76046c75e04f62802b20217a35f061383a1b..c83e9f7fbe13574d8c0bbad59740b84b397bc7ec
@@@ -7,7 -7,7 +7,8 @@@ incs = '. #/intern/guardedalloc ../incl
  incs += ' ../python ../render/extern/include #/intern/decimation/extern'
  incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
  incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
 +incs += ' #/extern/bullet2/src '
+ incs += ' #/intern/bmfont'
  
  incs += ' ' + env['BF_OPENGL_INC']
  incs += ' ' + env['BF_ZLIB_INC']
index 0a0c49c5ef8e0c4e4aed6d79a4c2d4dda60785a8,a059bf2a2c5588810747d63105a440d74180e581..3066f61717439d503031ab7abf35138489685778
@@@ -838,31 -772,13 +791,31 @@@ static void write_modifiers(WriteData *
        for (md=modbase->first; md; md= md->next) {
                ModifierTypeInfo *mti = modifierType_getInfo(md->type);
                if (mti == NULL) return;
+               
                writestruct(wd, DATA, mti->structName, 1, md);
+                       
                if (md->type==eModifierType_Hook) {
                        HookModifierData *hmd = (HookModifierData*) md;
+                       
                        writedata(wd, DATA, sizeof(int)*hmd->totindex, hmd->indexar);
 +      }
 +      else if (md->type==eModifierType_Cloth) {
 +                 int                                  n;
 +                 ClothModifierData    *clmd = (ClothModifierData *) md;
 +
 +                 if (clmd->sim_parms.cache) {
 +                        // Compute the number of vertices we're saving.
 +                         // TODO
 +                         // write_cloth_cache();
 +                        /*
 +                         // old code
 +                        n = (clmd->sim_parms.bake_end_frame - clmd->sim_parms.bake_start_frame + 1) *
 +                               clmd->sim_parms.bake_num_verts;
 +                        writedata (wd, DATA, n *  sizeof (clmd->baked_data [0]), clmd->baked_data);
 +                        printf ("write_modifiers: wrote %d elements of size %d for cloth baked data.\n",
 +                                        n, sizeof (clmd->baked_data [0]));
 +                         */
 +                 }
                }
        }
  }
Simple merge
index 8bca629eeac0ed645a799ef0bd12a538a9b64b5b,20f423621c202d99571a1c57bde6c4d8a32150cb..0e227f7efbc43e530d88615ff6ad9527e3747631
@@@ -842,23 -802,22 +804,24 @@@ static void draw_constraint (uiBlock *b
                                uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-10, *yco-height, width+40,height-1, NULL, 5.0, 0.0, 12, rb_col, ""); 
                                
                                uiDefBut(block, LABEL, B_CONSTRAINT_TEST, "Target:", *xco+65, *yco-24, 50, 18, NULL, 0.0, 0.0, 0.0, 0.0, ""); 
+                               
                                /* Draw target parameters */
                                uiBlockBeginAlign(block);
-                               uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_CONSTRAINT_CHANGETARGET, "OB:", *xco+120, *yco-24, 135, 18, &data->tar, "Target Object"); 
 -                                      uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_CONSTRAINT_CHANGETARGET, "OB:", *xco+120, *yco-24, 135, 18, &data->tar, "Target Object"); 
 -                                      
 -                                      if (is_armature_target(data->tar)) {
 -                                              but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "BO:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Subtarget Bone");
 -                                              uiButSetCompleteFunc(but, autocomplete_bone, (void *)data->tar);
 -                                      }
 -                                      else if (is_geom_target(data->tar)) { 
 -                                              but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "VG:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Name of Vertex Group defining 'target' points");
 -                                              uiButSetCompleteFunc(but, autocomplete_vgroup, (void *)data->tar);
 -                                      }
 -                                      else {
 -                                              strcpy(data->subtarget, "");
 -                                      }
 +
-                               if (is_armature_target) {
++                              uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_CONSTRAINT_CHANGETARGET, "OB:", *xco+120, *yco-24, 135, 18, &data->tar, "Target Object"); 
++                              
++                              if (is_armature_target(data->tar)) {
 +                                      but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "BO:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Subtarget Bone");
 +                                      uiButSetCompleteFunc(but, autocomplete_bone, (void *)data->tar);
 +                              }
-                               else if (is_geom_target) { 
++                              else if (is_geom_target(data->tar)) { 
 +                                      but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "VG:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Name of Vertex Group defining 'target' points");
 +                                      uiButSetCompleteFunc(but, autocomplete_vgroup, (void *)data->tar);
 +                              }
 +                              else {
-                                       strcpy (data->subtarget, "");
++                                      strcpy(data->subtarget, "");
 +                              }
-                               
++
                                uiBlockEndAlign(block);
                                
                                /* Draw XYZ toggles */
                                
                                /* Draw target parameters */
                                uiBlockBeginAlign(block);
-                               uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_CONSTRAINT_CHANGETARGET, "OB:", *xco+120, *yco-24, 135, 18, &data->tar, "Target Object"); 
-                               
-                               if (is_armature_target) {
-                                       but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "BO:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Subtarget Bone");
-                                       uiButSetCompleteFunc(but, autocomplete_bone, (void *)data->tar);
-                               }
-                               else if (is_geom_target) {
-                                       but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "VG:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Name of Vertex Group defining 'target' points");
-                                       uiButSetCompleteFunc(but, autocomplete_vgroup, (void *)data->tar);
-                               }
-                               else {
-                                       strcpy (data->subtarget, "");
-                               }
-                               
+                                       uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_CONSTRAINT_CHANGETARGET, "OB:", *xco+120, *yco-24, 135, 18, &data->tar, "Target Object"); 
+                                       
+                                       if (is_armature_target(data->tar)) {
+                                               but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "BO:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Subtarget Bone");
+                                               uiButSetCompleteFunc(but, autocomplete_bone, (void *)data->tar);
+                                       }
+                                       else if (is_geom_target(data->tar)) {
+                                               but= uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, "VG:", *xco+120, *yco-42,135,18, &data->subtarget, 0, 24, 0, 0, "Name of Vertex Group defining 'target' points");
+                                               uiButSetCompleteFunc(but, autocomplete_vgroup, (void *)data->tar);
+                                       }
+                                       else {
+                                               strcpy(data->subtarget, "");
+                                       }
                                uiBlockEndAlign(block);
 -                              
 +
                                /* Draw XYZ toggles */
                                uiBlockBeginAlign(block);
-                               but=uiDefButBitI(block, TOG, SIZELIKE_X, B_CONSTRAINT_TEST, "X", *xco+((width/2)-48), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy X component");
-                               but=uiDefButBitI(block, TOG, SIZELIKE_Y, B_CONSTRAINT_TEST, "Y", *xco+((width/2)-16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Y component");
-                               but=uiDefButBitI(block, TOG, SIZELIKE_Z, B_CONSTRAINT_TEST, "Z", *xco+((width/2)+16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Z component");
+                                       uiDefButBitI(block, TOG, SIZELIKE_X, B_CONSTRAINT_TEST, "X", *xco+((width/2)-48), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy X component");
+                                       uiDefButBitI(block, TOG, SIZELIKE_Y, B_CONSTRAINT_TEST, "Y", *xco+((width/2)-16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Y component");
+                                       uiDefButBitI(block, TOG, SIZELIKE_Z, B_CONSTRAINT_TEST, "Z", *xco+((width/2)+16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Z component");
                                uiBlockEndAlign(block);
                                
                                /* constraint space settings */
Simple merge