Merged changes in the trunk up to revision 33765.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Dec 2010 11:49:12 +0000 (11:49 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Dec 2010 11:49:12 +0000 (11:49 +0000)
36 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

@@@ -65,11 -64,16 +65,16 @@@ EXAMPLE_SET_USED = set(
  _BPY_STRUCT_FAKE = "bpy_struct"
  _BPY_FULL_REBUILD = False
  
  def undocumented_message(module_name, type_name, identifier):
 -    message = "Undocumented (`contribute "\
 -        "<http://wiki.blender.org/index.php/Dev:2.5/Py/API/Documentation/Contribute"\
 -        "?action=edit&section=new&preload=Dev:2.5/Py/API/Documentation/Contribute/Howto-message"\
+     if str(type_name).startswith('<module'):
+         preloadtitle = '%s.%s' % (module_name, identifier)
+     else:
+         preloadtitle = '%s.%s.%s' % (module_name, type_name, identifier)
-         "&preloadtitle=%s.%s.%s>`_)\n\n" % (module_name, type_name, identifier)
 +    message = "Undocumented (`contribute " \
 +        "<http://wiki.blender.org/index.php/Dev:2.5/Py/API/Documentation/Contribute" \
 +        "?action=edit&section=new&preload=Dev:2.5/Py/API/Documentation/Contribute/Howto-message" \
+         "&preloadtitle=%s>`_)\n\n" % preloadtitle
      return message
  
  
@@@ -402,7 -410,9 +417,10 @@@ def rna2sphinx(BASEPATH)
  
  
      fw("   mathutils.rst\n\n")
 +    fw("   Freestyle.rst\n\n")
+     fw("   mathutils.geometry.rst\n\n")
+     # XXX TODO
+     #fw("   bgl.rst\n\n")
      fw("   blf.rst\n\n")
      fw("   aud.rst\n\n")
      
      import mathutils as module
      pymodule2sphinx(BASEPATH, "mathutils", module, "Math Types & Utilities (mathutils)")
      del module
 -    
 +
+     import mathutils.geometry as module
+     pymodule2sphinx(BASEPATH, "mathutils.geometry", module, "Geometry Utilities (mathutils.geometry)")
+     del module
 +    import Freestyle as module
 +    pymodule2sphinx(BASEPATH, "Freestyle", module, "Freestyle Data Types & Operators (Freestyle)")
 +    del module
 +
      import blf as module
      pymodule2sphinx(BASEPATH, "blf", module, "Font Drawing (blf)")
      del module
Simple merge
  #
  # ***** END GPL LICENSE BLOCK *****
  
- ADD_SUBDIRECTORY(editors)
- ADD_SUBDIRECTORY(windowmanager)
- ADD_SUBDIRECTORY(blenkernel)
- ADD_SUBDIRECTORY(blenlib)
- ADD_SUBDIRECTORY(render)
- ADD_SUBDIRECTORY(blenfont)
- ADD_SUBDIRECTORY(blenloader)
- ADD_SUBDIRECTORY(readblenfile)
- ADD_SUBDIRECTORY(blenpluginapi)
- ADD_SUBDIRECTORY(ikplugin)
- ADD_SUBDIRECTORY(gpu)
- ADD_SUBDIRECTORY(imbuf)
- ADD_SUBDIRECTORY(avi)
- ADD_SUBDIRECTORY(nodes)
- ADD_SUBDIRECTORY(modifiers)
- ADD_SUBDIRECTORY(makesdna)
- ADD_SUBDIRECTORY(makesrna)
+ add_subdirectory(editors)
+ add_subdirectory(windowmanager)
+ add_subdirectory(blenkernel)
+ add_subdirectory(blenlib)
+ add_subdirectory(render)
+ add_subdirectory(blenfont)
+ add_subdirectory(blenloader)
+ add_subdirectory(readblenfile)
+ add_subdirectory(blenpluginapi)
+ add_subdirectory(ikplugin)
+ add_subdirectory(gpu)
+ add_subdirectory(imbuf)
+ add_subdirectory(avi)
+ add_subdirectory(nodes)
+ add_subdirectory(modifiers)
+ add_subdirectory(makesdna)
+ add_subdirectory(makesrna)
 +ADD_SUBDIRECTORY(freestyle)
  
IF(WITH_IMAGE_OPENEXR)
-       ADD_SUBDIRECTORY(imbuf/intern/openexr)
ENDIF(WITH_IMAGE_OPENEXR)
if(WITH_IMAGE_OPENEXR)
+       add_subdirectory(imbuf/intern/openexr)
endif()
  
IF(WITH_IMAGE_DDS)
-       ADD_SUBDIRECTORY(imbuf/intern/dds)
ENDIF(WITH_IMAGE_DDS)
if(WITH_IMAGE_DDS)
+       add_subdirectory(imbuf/intern/dds)
endif()
  
IF(WITH_IMAGE_CINEON)
-       ADD_SUBDIRECTORY(imbuf/intern/cineon)
ENDIF(WITH_IMAGE_CINEON)
if(WITH_IMAGE_CINEON)
+       add_subdirectory(imbuf/intern/cineon)
endif()
  
IF(WITH_CODEC_QUICKTIME)
-       ADD_SUBDIRECTORY(quicktime)
ENDIF(WITH_CODEC_QUICKTIME)
if(WITH_CODEC_QUICKTIME)
+       add_subdirectory(quicktime)
endif()
  
IF(WITH_PYTHON)
-       ADD_SUBDIRECTORY(python)
ENDIF(WITH_PYTHON)
if(WITH_PYTHON)
+       add_subdirectory(python)
endif()
  
IF(WITH_OPENCOLLADA)
-   ADD_SUBDIRECTORY(collada)
ENDIF(WITH_OPENCOLLADA)
if(WITH_OPENCOLLADA)
+   add_subdirectory(collada)
endif()
  
@@@ -33,10 -33,9 +33,10 @@@ set(IN
        ../../../intern/guardedalloc
        ${ZLIB_INC}
        ${FREETYPE_INCLUDE_DIRS}
 +      ${ZLIB_INC}
  )
  
SET(SRC
set(SRC
        intern/BLI_args.c
        intern/BLI_dynstr.c
        intern/BLI_ghash.c
@@@ -133,12 -130,8 +140,13 @@@ void BLI_bpathIterator_init(struct BPat
        bpi->seqdata.seqar= NULL;
        bpi->seqdata.scene= NULL;
        
-       bpi->base_path= base_path ? base_path : G.main->name;
 +      /* Freestyle module specific */
 +      bpi->frsmoduledata.scene= NULL;
 +      bpi->frsmoduledata.layer= NULL;
 +      bpi->frsmoduledata.module= NULL;
 +
+       bpi->base_path= basedir; /* normally bmain->name */
+       bpi->bmain= bmain;
  
        BLI_bpathIterator_step(bpi);
  }
@@@ -152,14 -145,13 +160,16 @@@ void BLI_bpathIterator_free( struct BPa
                MEM_freeN((void *)bpi->seqdata.seqar);
        bpi->seqdata.seqar= NULL;
        bpi->seqdata.scene= NULL;
 +      bpi->frsmoduledata.scene= NULL;
 +      bpi->frsmoduledata.layer= NULL;
 +      bpi->frsmoduledata.module= NULL;
+       
+       MEM_freeN(bpi);
  }
  
 -void BLI_bpathIterator_getPath(struct BPathIterator *bpi, char *path) {
 +void BLI_bpathIterator_getPath( struct BPathIterator *bpi, char *path) {
        if (bpi->getpath_callback) {
 -              bpi->getpath_callback(bpi, path);
 +              bpi->getpath_callback( bpi, path );
        } else {
                strcpy(path, bpi->_path); /* warning, we assume 'path' are long enough */
        }
@@@ -33,10 -33,9 +33,10 @@@ set(IN
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../extern/glew/include
 +      ../../freestyle
  )
  
SET(SRC
set(SRC
        render_internal.c
        render_opengl.c
        render_ops.c
Simple merge
Simple merge
Simple merge
@@@ -39,10 -39,9 +39,10 @@@ set(IN
        ../../kernel/gen_messaging
        ../../../intern/smoke/extern
        ../../../intern/guardedalloc
 +      ../freestyle
  )
  
SET(SRC
set(SRC
        intern/raytrace/rayobject.cpp
        intern/raytrace/rayobject_qbvh.cpp
        intern/raytrace/rayobject_rtbuild.cpp
@@@ -1537,10 -1533,10 +1538,10 @@@ static RenderPart *find_next_pano_slice
                        
        if(best) {
                float phi= panorama_pixel_rot(re);
-               /* R.disprect.xmax - R.disprect.xmin rather then R.winx for border render */
                R.panodxp= (re->winx - (best->disprect.xmin + best->disprect.xmax) )/2;
-               R.panodxv= ((viewplane->xmax-viewplane->xmin)*R.panodxp)/(float)(R.disprect.xmax - R.disprect.xmin);
+               R.panodxv= ((viewplane->xmax-viewplane->xmin)*R.panodxp)/(float)(re->winx);
 -
 +              
                /* shift viewplane */
                R.viewplane.xmin = viewplane->xmin + R.panodxv;
                R.viewplane.xmax = viewplane->xmax + R.panodxv;
Simple merge