Merged changes in the trunk up to revision 38543.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 20 Jul 2011 23:33:10 +0000 (23:33 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 20 Jul 2011 23:33:10 +0000 (23:33 +0000)
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

30 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/freestyle/intern/python/BPy_Convert.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
index b259656e2eb2f2a9c8e0a657131b4f3f8edb744c,6b514cf9eb167b9f20f28dd609e66a7d0443a33a..fa312819a34b4eaf5662bdb36bc17665aa2c67d8
@@@ -1027,10 -1029,8 +1037,10 @@@ def rna2sphinx(BASEPATH)
          fw("   mathutils.rst\n\n")
      if "mathutils.geometry" not in EXCLUDE_MODULES:
          fw("   mathutils.geometry.rst\n\n")
-     # XXX TODO
-     #fw("   bgl.rst\n\n")
 +    if "Freestyle" not in EXCLUDE_MODULES:
 +        fw("   Freestyle.rst\n\n")
+     if "bgl" not in EXCLUDE_MODULES:
+         fw("   bgl.rst\n\n")
      if "blf" not in EXCLUDE_MODULES:
          fw("   blf.rst\n\n")
      if "aud" not in EXCLUDE_MODULES:
index c56e6436c0459dfa798711e75835158db7307915,9a384c40e24e02e1364ae35dee3bd03a1e6c73ff..5d6751852cc17ba685519b020640d0457e80b110
@@@ -32,9 -32,10 +32,11 @@@ endif(
  set(INC 
        .
        ../avi
+       ../blenfont
        ../blenlib
        ../blenloader
+       ../editors/include
 +      ../freestyle
        ../gpu
        ../ikplugin
        ../imbuf
Simple merge
Simple merge
index 7e4e07472d889173f11a60b5067c7fe1be533add,0000000000000000000000000000000000000000..ef5a64bde3f54d6082cfc76294b64aa6047b534b
mode 100644,000000..100644
--- /dev/null
@@@ -1,147 -1,0 +1,147 @@@
- #include "generic/mathutils.h"
 +#ifndef FREESTYLE_PYTHON_CONVERT_H
 +#define FREESTYLE_PYTHON_CONVERT_H
 +
 +#include <Python.h>
 +#include <typeinfo>
 +
 +#include "../geometry/Geom.h"
 +using namespace Geometry;
 +
 +// BBox
 +#include "../geometry/BBox.h"
 +
 +// FEdge, FEdgeSharp, FEdgeSmooth, SShape, SVertex, FEdgeInternal::SVertexIterator
 +#include "../view_map/Silhouette.h" 
 +
 +// Id
 +#include "../system/Id.h"
 +
 +// Interface0D, Interface0DIteratorNested, Interface0DIterator
 +#include "../view_map/Interface0D.h"
 +
 +// Interface1D
 +#include "../view_map/Interface1D.h"
 +
 +// FrsMaterial
 +#include "../scene_graph/FrsMaterial.h"
 +
 +// Nature::VertexNature, Nature::EdgeNature
 +#include "../winged_edge/Nature.h"
 +
 +// Stroke, StrokeAttribute, StrokeVertex
 +#include "../stroke/Stroke.h"
 +
 +// NonTVertex, TVertex, ViewEdge, ViewMap, ViewShape, ViewVertex
 +#include "../view_map/ViewMap.h"
 +
 +// CurvePoint, Curve
 +#include "../stroke/Curve.h"
 +
 +// Chain
 +#include "../stroke/Chain.h"
 +
 +//====== ITERATORS
 +
 +// AdjacencyIterator, ChainingIterator, ChainSilhouetteIterator, ChainPredicateIterator
 +#include "../stroke/ChainingIterators.h"
 +
 +// ViewVertexInternal::orientedViewEdgeIterator
 +// ViewEdgeInternal::SVertexIterator
 +// ViewEdgeInternal::ViewEdgeIterator
 +#include "../view_map/ViewMapIterators.h"
 +
 +// StrokeInternal::StrokeVertexIterator
 +#include "../stroke/StrokeIterators.h"
 +
 +// CurveInternal::CurvePointIterator
 +#include "../stroke/CurveIterators.h"
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +///////////////////////////////////////////////////////////////////////////////////////////
 +
++#include "mathutils/mathutils.h"
 +
 +//==============================
 +// C++ => Python
 +//==============================
 +
 +PyObject * PyBool_from_bool( bool b );
 +PyObject * Vector_from_Vec2f( Vec2f& v );
 +PyObject * Vector_from_Vec3f( Vec3f& v );
 +PyObject * Vector_from_Vec3r( Vec3r& v );
 +
 +PyObject * Any_BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 +PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 +PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
 +PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
 +
 +PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 +PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
 +PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
 +PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 +PyObject * BPy_FEdgeSharp_from_FEdgeSharp( FEdgeSharp& fes );
 +PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth( FEdgeSmooth& fes );
 +PyObject * BPy_Id_from_Id( Id& id );
 +PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 +PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 +PyObject * BPy_IntegrationType_from_IntegrationType( IntegrationType i );
 +PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m );
 +PyObject * BPy_Nature_from_Nature( unsigned short n );
 +PyObject * BPy_MediumType_from_MediumType( Stroke::MediumType n );
 +PyObject * BPy_SShape_from_SShape( SShape& ss );
 +PyObject * BPy_Stroke_from_Stroke( Stroke& s );
 +PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 +PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 +PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 +PyObject * BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
 +PyObject * BPy_NonTVertex_from_NonTVertex( NonTVertex& ntv );
 +PyObject * BPy_TVertex_from_TVertex( TVertex& tv );
 +PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
 +PyObject * BPy_Chain_from_Chain( Chain& c );
 +PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
 +
 +PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator( AdjacencyIterator& a_it );
 +PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it, int reversed );
 +PyObject * BPy_CurvePointIterator_from_CurvePointIterator( CurveInternal::CurvePointIterator& cp_it );
 +PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it, int reversed);
 +PyObject * BPy_SVertexIterator_from_SVertexIterator( ViewEdgeInternal::SVertexIterator& sv_it );
 +PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it, int reversed );
 +PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator( ViewEdgeInternal::ViewEdgeIterator& ve_it );
 +PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it );
 +PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it );
 +PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it );
 +
 +//==============================
 +// Python => C++
 +//==============================
 +
 +bool bool_from_PyBool( PyObject *b );
 +IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
 +Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
 +Nature::EdgeNature EdgeNature_from_BPy_Nature( PyObject* obj );
 +Vec2f * Vec2f_ptr_from_PyObject( PyObject* obj );
 +Vec3f * Vec3f_ptr_from_PyObject( PyObject* obj );
 +Vec3r * Vec3r_ptr_from_PyObject( PyObject* obj );
 +Vec2f * Vec2f_ptr_from_Vector( PyObject* obj );
 +Vec3f * Vec3f_ptr_from_Vector( PyObject* obj );
 +Vec3r * Vec3r_ptr_from_Vector( PyObject* obj );
 +Vec2f * Vec2f_ptr_from_PyList( PyObject* obj );
 +Vec3f * Vec3f_ptr_from_PyList( PyObject* obj );
 +Vec3r * Vec3r_ptr_from_PyList( PyObject* obj );
 +Vec2f * Vec2f_ptr_from_PyTuple( PyObject* obj );
 +Vec3f * Vec3f_ptr_from_PyTuple( PyObject* obj );
 +Vec3r * Vec3r_ptr_from_PyTuple( PyObject* obj );
 +
 +
 +
 +///////////////////////////////////////////////////////////////////////////////////////////
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
 +
 +#endif /* FREESTYLE_PYTHON_CONVERT_H */
index b8540fabd5b622ebf9906f4270e30161eedf6cdc,060b1bf42d1228bd4818fb1a0815ee9deb957393..e94e394d255acc247b8b84d8c1d0c48f5162d18f
@@@ -161,8 -161,7 +161,10 @@@ typedef struct Material 
  
        int mapto_textured;     /* render-time cache to optimise texture lookups */
        short shadowonly_flag;          /* "shadowsonly" type */
 -        short index;    /* custom index for render passes */
++      short index;    /* custom index for render passes */
 +
 +      short vcol_alpha;
++      short pad[3];
  
        ListBase gpumaterial;           /* runtime */
  } Material;
Simple merge
index 31a4b623798782500cfd7600cbfb5f7beb7bf2c1,93a4b3ec2693395ac0bfd442a91f318505e374c9..d6a41b561fdcdec7bc49925d5c56d633f8986a51
  
  set(INC 
        ..
+       ../../blenkernel
        ../../blenlib
+       ../../blenloader
+       ../../editors/include
        ../../makesdna
        ../../makesrna
-       ../../blenkernel
-       ../../blenloader
        ../../windowmanager
-       ../../editors/include
 +      ../../freestyle/intern/python
        ../../../../intern/guardedalloc
  )
  
index fb94b827dea7575d205dc7c9e9342c9d64952aa4,3f637feadf742b1e99d7021a498dd993570e7255..a9b7573428874b724361c778075409d63465b265
  #include "MEM_guardedalloc.h"
  
   /* external util modules */
- #include "../generic/mathutils.h"
+ #include "../generic/IDProp.h"
  #include "../generic/bgl.h"
  #include "../generic/blf_py_api.h"
- #include "../generic/IDProp.h"
+ #include "../mathutils/mathutils.h"
  
 +#include "BPy_Freestyle.h"
 +
  PyObject *bpy_package_py= NULL;
  
  PyDoc_STRVAR(bpy_script_paths_doc,
index 617328b75307731c2a68b0e4a980f2c8b98af27f,90aef816e2ccc3c98e0a990ab3384ac56db59e7e..3fbc60f2c7fcd75f45c4278f459efa981a36a4cf
  
  
  set(INC 
-       intern/include
        extern/include
+       intern/include
+       ../blenkernel
        ../blenlib
        ../blenloader
+       ../imbuf
        ../makesdna
        ../makesrna
-       ../blenkernel
-       ../imbuf
-       ../../../intern/smoke/extern
-       ../../../intern/mikktspace
        ../../../intern/guardedalloc
+       ../../../intern/mikktspace
+       ../../../intern/smoke/extern
 +      ../freestyle
  )
  
  set(INC_SYS
Simple merge
index 1d04eb891d6d130db2162cd88116f96d0c9402b1,d9ed83a00b209f2d82ff3dfc33c56208531828c2..ad9a1f24355c92acf20d8b30b2ffff1bb7f01684
@@@ -218,9 -218,11 +218,12 @@@ void RE_TileProcessor(struct Render *re
  
  /* only RE_NewRender() needed, main Blender render calls */
  void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneRenderLayer *srl, struct Object *camera_override, unsigned int lay, int frame, const short write_still);
- void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, unsigned int lay, int sfra, int efra, int tfra, struct ReportList *reports);
+ void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, unsigned int lay, int sfra, int efra, int tfra);
 +void RE_RenderFreestyleStrokes(struct Render *re, struct Main *bmain, struct Scene *scene);
  
+ /* error reporting */
+ void RE_SetReports(struct Render *re, struct ReportList *reports);
  /* main preview render call */
  void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene);
  
index 5cbde06dfc6ffae753b6cd5a3f14357eff9fe5ed,b9006b390ab24433012601de0f93e869a0bb9bd1..f022323b9333ecdd97bf63a4ee1d9b8e7a39f8d6
@@@ -3017,16 -2949,7 +3024,16 @@@ void RE_BlenderFrame(Render *re, Main *
        G.rendering= 0;
  }
  
- static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh, ReportList *reports, const char *name_override)
 +void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene)
 +{
 +      re->result_ok= 0;
 +      if(render_initialize_from_main(re, bmain, scene, NULL, NULL, scene->lay, 0, 0)) {
 +              do_render_fields_blur_3d(re);
 +      }
 +      re->result_ok= 1;
 +}
 +
+ static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh, const char *name_override)
  {
        char name[FILE_MAX];
        RenderResult rres;
index 94d7bf4a56fda3286ff0eeee8103cd00c5892392,43fec85b5bf6f28e64a15f7dc353e5465a43d640..48dfe74afde274497730ad597229f9439c632f21
@@@ -756,7 -768,7 +769,8 @@@ endif(
                bf_intern_opennl
                bf_python
                bf_python_ext
+               bf_python_mathutils
 +              bf_freestyle
                bf_ikplugin
                bf_modifiers
                bf_blenkernel
Simple merge