Merged changes in the trunk up to revision 33348.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 27 Nov 2010 12:48:35 +0000 (12:48 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 27 Nov 2010 12:48:35 +0000 (12:48 +0000)
32 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/space_userpref.py
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/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
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/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
Simple merge
index 8822e868556eed3bc2f024c8615fe88c88148fd5,34c0e17f7d23ed5d96bd4d1c0c379a002a913864..e7215c3273c026af4059b720c7290c2ed2d7f455
@@@ -1718,13 -1732,12 +1729,15 @@@ int initTransform(bContext *C, TransInf
        return 1;
  }
  
- void transformApply(const bContext *C, TransInfo *t)
+ void transformApply(bContext *C, TransInfo *t)
  {
+       t->context = C;
        if ((t->redraw & TREDRAW_HARD) || (t->draw_handle_apply == NULL && (t->redraw & TREDRAW_SOFT)))
        {
 +              if (t->modifiers & MOD_CONSTRAINT_SELECT)
 +                      t->con.mode |= CON_SELECT;
 +
                selectConstraint(t);
                if (t->transform) {
                        t->transform(t, t->mval);  // calls recalcData()
Simple merge
Simple merge
index d280278b67769e5456bf2d4ee880b75d63bcae5e,993fa6adde543b49cfd83a7448c42e740f0f693f..83484f655e939a5cca19e92fa566c10e7944acd2
@@@ -7,9 -7,8 +7,9 @@@ o = SConscript('intern/SConscript'
  objs += o
  
  incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
- incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin'
+ incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont'
  incs += ' ../render/extern/include'
 +incs += ' ../freestyle'
  
  defs = []
  
index 0000000000000000000000000000000000000000,e849623ad65379a38e93455b1494494d0c11b7b0..09cff5990c89fd45552b6c1c1324dec9513ca733
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,59 +1,60 @@@
+ # ***** BEGIN GPL LICENSE BLOCK *****
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # The Original Code is Copyright (C) 2006, Blender Foundation
+ # All rights reserved.
+ #
+ # The Original Code is: all of this file.
+ #
+ # Contributor(s): Jacques Beaurainm, Campbell Barton
+ #
+ # ***** END GPL LICENSE BLOCK *****
+ SET(INC 
+       ../
+       ../../blenlib
+       ../../makesdna
+       ../../makesrna
+       ../../blenkernel
+       ../../windowmanager
+       ../../editors/include
++      ../../freestyle/intern/python
+       ../../../../intern/guardedalloc
+       ../../../../intern/audaspace/intern
+       ${PYTHON_INC}
+ )
+ SET(SRC
+       bpy.c
+       bpy_app.c
+       bpy_driver.c
+       bpy_interface.c
+       bpy_operator.c
+       bpy_operator_wrap.c
+       bpy_props.c
+       bpy_rna.c
+       bpy_rna_array.c
+       bpy_rna_callback.c
+       bpy_util.c
+       stubs.c
+ )
+ # only to check if buildinfo is available
+ IF(WITH_BUILDINFO)
+       ADD_DEFINITIONS(-DBUILD_DATE)
+ ENDIF(WITH_BUILDINFO)
+ BLENDERLIB(bf_python "${SRC}" "${INC}")
Simple merge
index 0bd8858d9d4176964e0ee7dc3445f75171d38eb6,49ea0ac03e86abc5d6cc934da97afb9ef7618f70..46377bc4831b56d59ab7416be52a41937ce3c905
@@@ -2931,19 -2860,19 +2936,19 @@@ void RE_BlenderFrame(Render *re, Main *
        if(render_initialize_from_main(re, bmain, scene, srl, lay, 0, 0)) {
                MEM_reset_peak_memory();
                do_render_all_options(re);
-       }
 -
 +              
-       if(write_still) {
-               if(BKE_imtype_is_movie(scene->r.imtype)) {
-                       /* operator checks this but incase its called from elsewhere */
-                       printf("Error: cant write single images with a movie format!\n");
-               }
-               else {
-                       char name[FILE_MAX];
-                       BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype, scene->r.scemode & R_EXTENSION, FALSE);
-                       /* reports only used for Movie */
-                       do_write_image_or_movie(re, scene, NULL, NULL, name);
+               if(write_still && !G.afbreek) {
+                       if(BKE_imtype_is_movie(scene->r.imtype)) {
+                               /* operator checks this but incase its called from elsewhere */
+                               printf("Error: cant write single images with a movie format!\n");
+                       }
+                       else {
+                               char name[FILE_MAX];
+                               BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype, scene->r.scemode & R_EXTENSION, FALSE);
+       
+                               /* reports only used for Movie */
+                               do_write_image_or_movie(re, scene, NULL, NULL, name);
+                       }
                }
        }
  
Simple merge
Simple merge