Merged changes in the trunk up to revision 37799.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Jun 2011 00:49:53 +0000 (00:49 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Jun 2011 00:49:53 +0000 (00:49 +0000)
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies.  Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.

19 files changed:
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/render/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
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/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
index f15f3093a8626bca76c5ea31811e90408b7da4b7,0c136fc429b2cdaf8c4c22c24d75e8e300c930d0..3416f4783158becebcc278f81c3eb6de97d1f94b
@@@ -1219,7 -1175,13 +1221,13 @@@ static void rna_def_tool_settings(Blend
        RNA_def_property_ui_text(prop, "Project Individual Elements", "Project individual elements on the surface of other objects");
        RNA_def_property_ui_icon(prop, ICON_RETOPO, 0);
        RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
--
++      
+       prop= RNA_def_property(srna, "use_snap_project_self", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_flag", SCE_SNAP_PROJECT_NO_SELF);
+       RNA_def_property_ui_text(prop, "Project to Self", "Project into its self (editmode)");
+       RNA_def_property_ui_icon(prop, ICON_ORTHO, 0);
+       RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
+       
        /* Grease Pencil */
        prop = RNA_def_property(srna, "use_grease_pencil_sessions", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "gpencil_flags", GP_TOOL_FLAG_PAINTSESSIONS_ON);
index 0233f85ae9199c2ec2ccfb1ebf57d1b3314ef598,287ba45a1cf923ad59c66974e560487cbe9174e2..31a4b623798782500cfd7600cbfb5f7beb7bf2c1
@@@ -32,9 -32,7 +32,8 @@@ set(IN
        ../../blenloader
        ../../windowmanager
        ../../editors/include
 +      ../../freestyle/intern/python
        ../../../../intern/guardedalloc
-       ../../../../intern/audaspace/intern
  )
  
  set(INC_SYS
index ce548af378020ae42288ecfd5e0bccf2be1ec97b,fb4c285a45866afd7a70705c37de72d7f9e9c709..fb94b827dea7575d205dc7c9e9342c9d64952aa4
  #include "../generic/blf_py_api.h"
  #include "../generic/IDProp.h"
  
- #include "AUD_PyInit.h"
 +#include "BPy_Freestyle.h"
 +
  PyObject *bpy_package_py= NULL;
  
  PyDoc_STRVAR(bpy_script_paths_doc,
Simple merge
index 0f716cfa85fef9335bfd94a701f6fb99a330605f,b1c9820337c779f6c03c9d41233a60f0ac35832d..5cbde06dfc6ffae753b6cd5a3f14357eff9fe5ed
@@@ -2988,8 -2916,11 +2991,11 @@@ void RE_BlenderFrame(Render *re, Main *
        
        if(render_initialize_from_main(re, bmain, scene, srl, camera_override, lay, 0, 0)) {
                MEM_reset_peak_memory();
+               BLI_exec_cb(re->main, (ID *)scene, BLI_CB_EVT_RENDER_PRE);
                do_render_all_options(re);
 -
 +              
                if(write_still && !G.afbreek) {
                        if(BKE_imtype_is_movie(scene->r.imtype)) {
                                /* operator checks this but incase its called from elsewhere */
Simple merge
Simple merge