Merged changes in the trunk up to revision 36092.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 11 Apr 2011 00:09:56 +0000 (00:09 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 11 Apr 2011 00:09:56 +0000 (00:09 +0000)
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c

19 files changed:
1  2 
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/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/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
index bfb83d1284865749a34332d4bfbacf89bb85027a,16cfca8dadb7b526734ac66adf744cf87dc9058f..cb67026ffbd9fa95359b63ac6fb538c1f2371ebb
@@@ -32,8 -32,7 +32,8 @@@ set(IN
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
-       ../../../../extern/glew/include
+     ${GLEW_INCLUDE_PATH}
 +      ../../freestyle
  )
  
  set(SRC
index bca1cfb6f37fdef585517d482805c3713fec97d9,86ba81aae584eaf8807230a61a12640b03fe6849..a2d332ec8077243558879247383b44464e49c2e6
@@@ -9,7 -9,7 +9,8 @@@ 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 += ' #/extern/glew/include'
 +incs += ' ../freestyle'
  
  defs = []
  
index bed068f556607244b5efeadc689e0af0c06c2456,9f44c0acad3865fb10a0984486a3daf9cfd242b4..7f0518b4a79d98962c478039e2f8f8c408a27b77
@@@ -144,8 -144,6 +144,7 @@@ blender_include_dirs
        ../../windowmanager
        ../../editors/include
        ../../render/extern/include
-       ../../../../extern/glew/include
 +      ../../freestyle
        ../../../../intern/audaspace/intern
        ../../../../intern/guardedalloc
        ../../../../intern/memutil
Simple merge
index 0aa561c2292e68798de96dd1b68d4f617e5f36cc,645d0ac0578ad5da021ded29fa5094d65c19ed0d..82d9fbbaa92bf4a3c0251c869f16229e5c408612
@@@ -2377,7 -2306,7 +2377,8 @@@ static void do_merge_fullsample(Render 
                                if(re1->scene->id.flag & LIB_DOIT) {
                                        if(re1->r.scemode & R_FULL_SAMPLE) {
                                                read_render_result(re1, sample);
 +                                              composite_freestyle_renders(re1, sample);
+                                               ntreeCompositTagRender(re1->scene); /* ensure node gets exec to put buffers on stack */
                                        }
                                }
                        }
Simple merge
Simple merge