Merged changes in the trunk up to revision 52690.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 1 Dec 2012 02:47:59 +0000 (02:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 1 Dec 2012 02:47:59 +0000 (02:47 +0000)
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

19 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/datafiles/startup.blend
source/blender/blenkernel/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_operators.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/WM_types.h
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
@@@ -1539,9 -1537,9 +1545,9 @@@ def write_rst_contents(basepath)
          # mathutils
          "mathutils", "mathutils.geometry", "mathutils.noise",
          # misc
 -        "bgl", "blf", "gpu", "aud", "bpy_extras",
 +        "Freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras",
          # bmesh
-         "bmesh", "bmesh.types", "bmesh.utils",
+         "bmesh", "bmesh.types", "bmesh.utils", "bmesh.ops",
          )
  
      for mod in standalone_modules:
index 3d31f9c,cdd43c7..49212f6
Binary files differ
Simple merge
@@@ -422,50 -430,43 +431,43 @@@ void BLI_bpath_traverse_id(Main *bmain
                }                                                                      \
        } (void)0
  
-                       {
-                               Object *ob = (Object *)id;
-                               ModifierData *md;
-                               ParticleSystem *psys;
 -                      /* do via modifiers instead */
 +                              /* do via modifiers instead */
  #if 0
 -                      if (ob->fluidsimSettings) {
 -                              rewrite_path_fixed(ob->fluidsimSettings->surfdataPath, visit_cb, absbase, bpath_user_data);
 -                      }
 +                              if (ob->fluidsimSettings) {
 +                                      rewrite_path_fixed(ob->fluidsimSettings->surfdataPath, visit_cb, absbase, bpath_user_data);
 +                              }
  #endif
  
 -                      for (md = ob->modifiers.first; md; md = md->next) {
 -                              if (md->type == eModifierType_Fluidsim) {
 -                                      FluidsimModifierData *fluidmd = (FluidsimModifierData *)md;
 -                                      if (fluidmd->fss) {
 -                                              rewrite_path_fixed(fluidmd->fss->surfdataPath, visit_cb, absbase, bpath_user_data);
 +                              for (md = ob->modifiers.first; md; md = md->next) {
 +                                      if (md->type == eModifierType_Fluidsim) {
 +                                              FluidsimModifierData *fluidmd = (FluidsimModifierData *)md;
 +                                              if (fluidmd->fss) {
 +                                                      rewrite_path_fixed(fluidmd->fss->surfdataPath, visit_cb, absbase, bpath_user_data);
 +                                              }
                                        }
 -                              }
 -                              else if (md->type == eModifierType_Smoke) {
 -                                      SmokeModifierData *smd = (SmokeModifierData *)md;
 -                                      if (smd->type & MOD_SMOKE_TYPE_DOMAIN) {
 -                                              BPATH_TRAVERSE_POINTCACHE(smd->domain->ptcaches[0]);
 +                                      else if (md->type == eModifierType_Smoke) {
 +                                              SmokeModifierData *smd = (SmokeModifierData *)md;
 +                                              if (smd->type & MOD_SMOKE_TYPE_DOMAIN) {
 +                                                      BPATH_TRAVERSE_POINTCACHE(smd->domain->ptcaches[0]);
 +                                              }
 +                                      }
 +                                      else if (md->type == eModifierType_Cloth) {
 +                                              ClothModifierData *clmd = (ClothModifierData *) md;
 +                                              BPATH_TRAVERSE_POINTCACHE(clmd->ptcaches);
 +                                      }
 +                                      else if (md->type == eModifierType_Ocean) {
 +                                              OceanModifierData *omd = (OceanModifierData *) md;
 +                                              rewrite_path_fixed(omd->cachepath, visit_cb, absbase, bpath_user_data);
                                        }
                                }
 -                              else if (md->type == eModifierType_Cloth) {
 -                                      ClothModifierData *clmd = (ClothModifierData *) md;
 -                                      BPATH_TRAVERSE_POINTCACHE(clmd->ptcaches);
 -                              }
 -                              else if (md->type == eModifierType_Ocean) {
 -                                      OceanModifierData *omd = (OceanModifierData *) md;
 -                                      rewrite_path_fixed(omd->cachepath, visit_cb, absbase, bpath_user_data);
 -                              }
 -                      }
  
 -                      if (ob->soft) {
 -                              BPATH_TRAVERSE_POINTCACHE(ob->soft->ptcaches);
 -                      }
 +                              if (ob->soft) {
 +                                      BPATH_TRAVERSE_POINTCACHE(ob->soft->ptcaches);
 +                              }
  
 -                      for (psys = ob->particlesystem.first; psys; psys = psys->next) {
 -                              BPATH_TRAVERSE_POINTCACHE(psys->ptcaches);
 -                      }
 +                              for (psys = ob->particlesystem.first; psys; psys = psys->next) {
 +                                      BPATH_TRAVERSE_POINTCACHE(psys->ptcaches);
 +                              }
-                       }
  
  #undef BPATH_TRAVERSE_POINTCACHE
  
                                        rewrite_path_fixed(((VFont *)id)->name, visit_cb, absbase, bpath_user_data);
                                }
                        }
+                       break;
                }
 -                      break;
+               case ID_MA:
+               {
+                       Material *ma = (Material *)id;
+                       bNodeTree *ntree = ma->nodetree;
+                       if(ntree) {
+                               bNode *node;
+                               for (node = ntree->nodes.first; node; node = node->next) {
+                                       if (node->type == SH_NODE_SCRIPT) {
+                                               NodeShaderScript *nss = (NodeShaderScript *)node->storage;
+                                               rewrite_path_fixed(nss->filepath, visit_cb, absbase, bpath_user_data);
+                                       }
+                               }
+                       }
 +              break;
+               }
+               case ID_NT:
+               {
+                       bNodeTree *ntree = (bNodeTree *)id;
+                       bNode *node;
+                       if (ntree->type == NTREE_SHADER) {
+                               /* same as lines above */
+                               for (node = ntree->nodes.first; node; node = node->next) {
+                                       if (node->type == SH_NODE_SCRIPT) {
+                                               NodeShaderScript *nss = (NodeShaderScript *)node->storage;
+                                               rewrite_path_fixed(nss->filepath, visit_cb, absbase, bpath_user_data);
+                                       }
+                               }
+                       }
+                       break;
+               }
                case ID_TE:
                {
                        Tex *tex = (Tex *)id;
                                }
                                SEQ_END
                        }
 +                      for(; srl; srl= srl->next) {
 +                              FreestyleModuleConfig* module= srl->freestyleConfig.modules.first;
 +                              for (; module; module= module->next) {
 +                                      rewrite_path_fixed(module->module_path, visit_cb, absbase, bpath_user_data);
 +                              }
 +                      }
+                       break;
                }
-               break;
                case ID_ME:
                {
                        Mesh *me = (Mesh *)id;
Simple merge
Simple merge
Simple merge