synched with trunk at revision 30597
authorNick Samarin <nicks1987@bigmir.net>
Wed, 21 Jul 2010 20:54:53 +0000 (20:54 +0000)
committerNick Samarin <nicks1987@bigmir.net>
Wed, 21 Jul 2010 20:54:53 +0000 (20:54 +0000)
20 files changed:
1  2 
projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
projectfiles_vc9/blender/editors/ED_editors.vcproj
release/scripts/ui/properties_data_modifier.py
release/scripts/ui/properties_game.py
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/space_logic/logic_window.c
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/gameengine/Ketsji/KX_GameObject.cpp

@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <VisualStudioProject\r
        ProjectType="Visual C++"\r
--      Version="9,00"\r
++      Version="9.00"\r
        Name="BPY_python"\r
        ProjectGUID="{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}"\r
        RootNamespace="BPY_python"\r
                                        RelativePath="..\..\..\source\blender\python\generic\mathutils_vector.c"\r
                                        >\r
                                </File>\r
++                              <File\r
++                                      RelativePath="..\..\..\source\blender\python\generic\noise.c"\r
++                                      >\r
++                              </File>\r
                        </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="datafiles"\r
                        Filter="c"\r
                        >\r
-                               RelativePath="..\..\..\source\blender\editors\datafiles\B.blend.c"\r
 +                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\add.png.c"\r
 +                              >\r
 +                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\datafiles\Bfont.c"\r
                                >\r
                                RelativePath="..\..\..\source\blender\editors\datafiles\blenderbuttons.c"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\blob.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\blur.png.c"\r
++                              >\r
++                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\datafiles\bmonofont.ttf.c"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\clay.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\clone.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\crease.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\darken.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\draw.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\fill.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\flatten.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\grab.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\inflate.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\layer.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\lighten.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\mix.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\multiply.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\nudge.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\pinch.png.c"\r
++                              >\r
++                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\datafiles\preview.blend.c"\r
                                >\r
                                RelativePath="..\..\..\source\blender\editors\datafiles\prvicons.c"\r
                                >\r
                        </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\scrape.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\smear.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\smooth.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\snake_hook.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\soften.png.c"\r
++                              >\r
++                      </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\editors\datafiles\splash.png.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\source\blender\editors\datafiles\startup.blend.c"\r
+                               >\r
+                       </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\subtract.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\texdraw.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\thumb.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\twist.png.c"\r
++                              >\r
++                      </File>\r
++                      <File\r
++                              RelativePath="..\..\..\source\blender\editors\datafiles\vertexdraw.png.c"\r
++                              >\r
++                      </File>\r
                </Filter>\r
                <Filter\r
                        Name="interface"\r
Simple merge
@@@ -10958,44 -10957,103 +10962,140 @@@ static void do_versions(FileData *fd, L
                                tex->saturation= 1.0f;
                }
  
 -
 +              //set defaults for obstacle avoidance, recast data
 +              {
 +                      Scene *sce;
 +                      for(sce = main->scene.first; sce; sce = sce->id.next)
 +                      {
 +                              
 +                              if (sce->gm.levelHeight == 0.f)
 +                                      sce->gm.levelHeight = 2.f;
 +                              
 +                              if(sce->gm.recastData.cellsize == 0.0f)
 +                                      sce->gm.recastData.cellsize = 0.3f;
 +                              if(sce->gm.recastData.cellheight == 0.0f)
 +                                      sce->gm.recastData.cellheight = 0.2f;
 +                              if(sce->gm.recastData.agentmaxslope == 0.0f)
 +                                      sce->gm.recastData.agentmaxslope = M_PI/4;
 +                              if(sce->gm.recastData.agentmaxclimb == 0.0f)
 +                                      sce->gm.recastData.agentmaxclimb = 0.9f;
 +                              if(sce->gm.recastData.agentheight == 0.0f)
 +                                      sce->gm.recastData.agentheight = 2.0f;
 +                              if(sce->gm.recastData.agentradius == 0.0f)
 +                                      sce->gm.recastData.agentradius = 0.6f;
 +                              if(sce->gm.recastData.edgemaxlen == 0.0f)
 +                                      sce->gm.recastData.edgemaxlen = 12.0f;
 +                              if(sce->gm.recastData.edgemaxerror == 0.0f)
 +                                      sce->gm.recastData.edgemaxerror = 1.3f;
 +                              if(sce->gm.recastData.regionminsize == 0.0f)
 +                                      sce->gm.recastData.regionminsize = 50.f;
 +                              if(sce->gm.recastData.regionmergesize == 0.0f)
 +                                      sce->gm.recastData.regionmergesize = 20.f;
 +                              if(sce->gm.recastData.vertsperpoly<3)
 +                                      sce->gm.recastData.vertsperpoly = 6;
 +                              if(sce->gm.recastData.detailsampledist == 0.0f)
 +                                      sce->gm.recastData.detailsampledist = 6.0f;
 +                              if(sce->gm.recastData.detailsamplemaxerror == 0.0f)
 +                                      sce->gm.recastData.detailsamplemaxerror = 1.0f;
 +                      }                       
 +              }
++
+               {
+                       Curve *cu;
+                       for(cu= main->curve.first; cu; cu= cu->id.next) {
+                               cu->smallcaps_scale= 0.75f;
+                       }
+               }
+               for (scene= main->scene.first; scene; scene=scene->id.next) {
+                       if(scene) {
+                               Sequence *seq;
+                               SEQ_BEGIN(scene->ed, seq) {
+                                       if(seq->sat==0.0f) {
+                                               seq->sat= 1.0f;
+                                       }
+                               }
+                               SEQ_END
+                       }
+               }
+               /* GSOC 2010 Sculpt - New settings for Brush */
+               for (brush= main->brush.first; brush; brush= brush->id.next) {
+                       /* Sanity Check */
+                       // infinite number of dabs
+                       if (brush->spacing == 0)
+                               brush->spacing = 10;
+                       // will have no effect
+                       if (brush->alpha == 0)
+                               brush->alpha = 0.5f;
+                       // bad radius
+                       if (brush->unprojected_radius == 0)
+                               brush->unprojected_radius = 0.125;
+                       // unusable size
+                       if (brush->size == 0)
+                               brush->size = 35;
+                       // can't see overlay
+                       if (brush->texture_overlay_alpha == 0)
+                               brush->texture_overlay_alpha = 33;
+                       // same as draw brush
+                       if (brush->crease_pinch_factor == 0)
+                               brush->crease_pinch_factor = 0.5f;
+                       // will sculpt no vertexes
+                       if (brush->plane_trim == 0)
+                               brush->plane_trim = 0.5f;
+                       // same as smooth stroke off
+                       if (brush->smooth_stroke_radius == 0)
+                               brush->smooth_stroke_radius= 75;
+                       // will keep cursor in one spot
+                       if (brush->smooth_stroke_radius == 1)
+                               brush->smooth_stroke_factor= 0.9f;
+                       // same as dots
+                       if (brush->rate == 0)
+                               brush->rate = 0.1f;
+                       /* New Settings */
+                       if (main->versionfile < 252 || (main->versionfile == 252 && main->subversionfile < 5)) {
+                               brush->flag |= BRUSH_SPACE_ATTEN; // explicitly enable adaptive space
+                               // spacing was originally in pixels, convert it to percentage for new version
+                               // size should not be zero due to sanity check above
+                               brush->spacing = (int)(100*((float)brush->spacing) / ((float)brush->size));
+                               if (brush->add_col[0] == 0 &&
+                                       brush->add_col[1] == 0 &&
+                                       brush->add_col[2] == 0)
+                               {
+                                       brush->add_col[0] = 1.00;
+                                       brush->add_col[1] = 0.39;
+                                       brush->add_col[2] = 0.39;
+                               }
+                               if (brush->sub_col[0] == 0 &&
+                                       brush->sub_col[1] == 0 &&
+                                       brush->sub_col[2] == 0)
+                               {
+                                       brush->sub_col[0] = 0.39;
+                                       brush->sub_col[1] = 0.39;
+                                       brush->sub_col[2] = 1.00;
+                               }
+                       }
+               }
+       }
+       /* put compatibility code here until next subversion bump */
+       {
        }
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */