Merged changes in the trunk up to revision 43404.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 15 Jan 2012 23:13:12 +0000 (23:13 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 15 Jan 2012 23:13:12 +0000 (23:13 +0000)
Conflicts resolved:
source/blender/python/SConscript

36 files changed:
1  2 
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_editVert.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

Simple merge
index 029e526c2560f57d550d723ae043a3cd1e9c26db,6a54817e861711d0c3362fd0d80cca568d7b6330..fffe6a737a4d2f893dedd273ee3599f0b41a5096
@@@ -13128,33 -12939,45 +13128,67 @@@ static void do_versions(FileData *fd, L
                }
        }
  
+       if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 2))
+       {
+               {
+                       /* convert Camera Actuator values to defines */
+                       Object *ob;
+                       bActuator *act;
+                       for(ob = main->object.first; ob; ob= ob->id.next) {
+                               for(act= ob->actuators.first; act; act= act->next) {
+                                       if (act->type == ACT_CAMERA) {
+                                               bCameraActuator *ba= act->data;
+                                               if(ba->axis==(float) 'x') ba->axis=OB_POSX;
+                                               else if (ba->axis==(float)'y') ba->axis=OB_POSY;
+                                               /* don't do an if/else to avoid imediate subversion bump*/
+ //                                    ba->axis=((ba->axis == (float) 'x')?OB_POSX_X:OB_POSY);
+                                       }
+                               }
+                       }
+               }
+               {
+                       /* convert deprecated sculpt_paint_unified_* fields to
+                          UnifiedPaintSettings */
+                       Scene *scene;
+                       for(scene= main->scene.first; scene; scene= scene->id.next) {
+                               ToolSettings *ts= scene->toolsettings;
+                               UnifiedPaintSettings *ups= &ts->unified_paint_settings;
+                               ups->size= ts->sculpt_paint_unified_size;
+                               ups->unprojected_radius= ts->sculpt_paint_unified_unprojected_radius;
+                               ups->alpha= ts->sculpt_paint_unified_alpha;
+                               ups->flag= ts->sculpt_paint_settings;
+                       }
+               }
+       }
+       
        /* put compatibility code here until next subversion bump */
        {
-               
        }
  
 +      /* default values in Freestyle settings */
 +      {
 +              Scene *sce;
 +              SceneRenderLayer *srl;
 +              FreestyleLineStyle *linestyle;
 +
 +              for(sce = main->scene.first; sce; sce = sce->id.next) {
 +                      for(srl= sce->r.layers.first; srl; srl= srl->next) {
 +                              if (srl->freestyleConfig.mode == 0)
 +                                      srl->freestyleConfig.mode= FREESTYLE_CONTROL_EDITOR_MODE;
 +                              if (srl->freestyleConfig.raycasting_algorithm == 0)
 +                                      srl->freestyleConfig.raycasting_algorithm= FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE;
 +                      }
 +              }
 +              for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 +                      if (linestyle->chaining == 0)
 +                              linestyle->chaining= LS_CHAINING_PLAIN;
 +                      if (linestyle->rounds == 0)
 +                              linestyle->rounds= 3;
 +              }
 +      }
 +      
        /* 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! */
  
Simple merge
Simple merge
index 72c2f9a1caf9960012e019b302b3094e0e8dfb27,e1475a90357e0fe2e4667fd5e8fb79d3e3481ab0..2df5d29fcae86c271a52c542f415aaa07f03305b
@@@ -8,10 -8,9 +8,10 @@@ objs += 
  
  incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
  incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
- incs += ' ../render/extern/include'
+ incs += ' ../render/extern/include #/intern/cycles/blender'
  incs += ' ../nodes'
  incs += ' #/extern/glew/include'
 +incs += ' ../freestyle'
  
  defs = []
  
index 24db4e80c2b276c7a57895669329825a8ff2b9f4,5bbdac646a790ca8178c1645b3631ff7bed892d4..4aa90bf93eaeea1e82a11460b817f037a981a387
@@@ -246,8 -248,8 +249,9 @@@ blender_include_dirs
        ../../windowmanager
        ../../editors/include
        ../../render/extern/include
 +      ../../freestyle
        ../../../../intern/audaspace/intern
+       ../../../../intern/cycles/blender
        ../../../../intern/guardedalloc
        ../../../../intern/memutil
  )
index c98f347d5afe347ed1e35e1f3f0117dd9a79e93b,2a47c2dcb96be360aff9520a8a920c82d846b2ae..e9c8d50ef8512e83d6ceff536041c2e83d1986d4
@@@ -6,8 -6,7 +6,8 @@@ Import ('env'
  
  incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes'
  incs += ' ../imbuf ../blenloader ../gpu ../render/extern/include ../windowmanager'
- incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
 +incs += ' ../freestyle/intern/python'
+ incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender'
  incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
  
  is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG'])
index 76fe439027f68c616d786b5ee66cd0e838d7b6af,05583e133dc0840eab6672b97eba85fd4f64ab76..4b397ee1870d514525a755569c4c48f643a5af9b
@@@ -34,8 -34,8 +34,9 @@@ set(IN
        ../../makesrna
        ../../windowmanager
        ../../gpu
 +      ../../freestyle/intern/python
        ../../../../intern/guardedalloc
+       ../../../../intern/cycles/blender
  )
  
  set(INC_SYS
Simple merge