Merged changes in the trunk up to revision 26669.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 7 Feb 2010 13:19:44 +0000 (13:19 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 7 Feb 2010 13:19:44 +0000 (13:19 +0000)
14 files changed:
1  2 
release/scripts/ui/properties_material.py
release/scripts/ui/properties_render.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
index c6755e704923a8361ac4e9ce02806710c7e1d0bb,f7aeee14cb7a58bd9fb614f1df6b724f5a143ca0..259cb6d7c905cf01f8469460bc505c387e9f99b0
@@@ -3175,11 -3172,8 +3175,11 @@@ static int screen_render_invoke(bContex
        /* handle UI stuff */
        WM_cursor_wait(1);
        
 +      /* inform Freestyle of the context */
 +      FRS_set_context(C);
 +
        /* flush multires changes (for sculpt) */
-       multires_force_update(CTX_data_active_object(C));
+       multires_force_render_update(CTX_data_active_object(C));
        
        /* get editmode results */
        ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO);     /* 0 = does not exit editmode */
index 1ee0fde1905fa2c5511d6775aef138e3cb083791,938c0ba7cfad000e6081ab5a1dad1e3f8d519a2e..a7cfcc09b5d179bc5adc7cded1bf93019d03bce3
@@@ -1624,13 -1630,10 +1627,13 @@@ int initTransform(bContext *C, TransInf
        return 1;
  }
  
- void transformApply(bContext *C, TransInfo *t)
+ void transformApply(const bContext *C, TransInfo *t)
  {
-       if (t->redraw)
+       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