[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29610] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29587 :29608
Brecht Van Lommel
brecht at blender.org
Tue Jun 22 12:52:32 CEST 2010
Revision: 29610
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29610
Author: blendix
Date: 2010-06-22 12:52:32 +0200 (Tue, 22 Jun 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29587:29608
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/release/scripts/ui/space_time.py
branches/render25/release/scripts/ui/space_view3d_toolbar.py
branches/render25/source/blender/blenkernel/BKE_key.h
branches/render25/source/blender/blenkernel/BKE_paint.h
branches/render25/source/blender/blenkernel/BKE_sequencer.h
branches/render25/source/blender/blenkernel/BKE_texture.h
branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/key.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenlib/BLI_pbvh.h
branches/render25/source/blender/blenlib/intern/pbvh.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/curve/curve_intern.h
branches/render25/source/blender/editors/curve/curve_ops.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/include/ED_screen.h
branches/render25/source/blender/editors/include/ED_screen_types.h
branches/render25/source/blender/editors/physics/particle_object.c
branches/render25/source/blender/editors/physics/physics_pointcache.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/render25/source/blender/editors/space_sequencer/sequencer_select.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesrna/intern/makesrna.c
branches/render25/source/blender/makesrna/intern/rna_internal.h
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/blender/windowmanager/intern/wm_files.c
Added Paths:
-----------
branches/render25/source/blender/makesrna/intern/rna_sequencer_api.c
Property Changed:
----------------
branches/render25/doc/blender.1
branches/render25/release/scripts/modules/blend_render_info.py
Property changes on: branches/render25/doc/blender.1
___________________________________________________________________
Name: svn:mime-type
+ application/x-troff-man
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: branches/render25/release/scripts/modules/blend_render_info.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/render25/release/scripts/ui/properties_data_curve.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_curve.py 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/release/scripts/ui/properties_data_curve.py 2010-06-22 10:52:32 UTC (rev 29610)
@@ -367,22 +367,37 @@
text = context.curve
wide_ui = context.region.width > narrowui
+
+ split = layout.split()
+ col = split.column()
+ col.operator("font.textbox_add", icon='ZOOMIN')
+ if wide_ui:
+ col = split.column()
+
+ for i, box in enumerate(text.textboxes):
+
+ boxy = layout.box()
+
+ split = boxy.split()
+
+ col = split.column()
+
+ col2 = col.column(align=True)
+ col2.label(text="Dimensions:")
+ col2.prop(box, "width", text="Width")
+ col2.prop(box, "height", text="Height")
- for box in text.textboxes:
- split = layout.box().split()
-
- col = split.column(align=True)
- col.label(text="Dimensions:")
- col.prop(box, "width", text="Width")
- col.prop(box, "height", text="Height")
-
if wide_ui:
- col = split.column(align=True)
- col.label(text="Offset:")
- col.prop(box, "x", text="X")
- col.prop(box, "y", text="Y")
+ col = split.column()
+
+ row = col.row()
+ row.label(text="Offset:")
+ row.operator("font.textbox_remove", text='', icon='X').index = i
+
+ col2 = col.column(align=True)
+ col2.prop(box, "x", text="X")
+ col2.prop(box, "y", text="Y")
-
classes = [
DATA_PT_context_curve,
DATA_PT_shape_curve,
Modified: branches/render25/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/render25/release/scripts/ui/space_sequencer.py 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/release/scripts/ui/space_sequencer.py 2010-06-22 10:52:32 UTC (rev 29610)
@@ -291,7 +291,11 @@
layout.operator_menu_enum("sequencer.swap", "side")
+ layout.separator()
+ layout.operator("sequencer.swap_data")
+
+
class SequencerButtonsPanel(bpy.types.Panel):
bl_space_type = 'SEQUENCE_EDITOR'
bl_region_type = 'UI'
Modified: branches/render25/release/scripts/ui/space_time.py
===================================================================
--- branches/render25/release/scripts/ui/space_time.py 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/release/scripts/ui/space_time.py 2010-06-22 10:52:32 UTC (rev 29610)
@@ -99,10 +99,32 @@
layout.prop(st, "only_selected")
layout.separator()
+
+ layout.menu("TIME_MT_cache")
+
+ layout.separator()
layout.operator("marker.camera_bind")
+
+class TIME_MT_cache(bpy.types.Menu):
+ bl_label = "Cache"
+ def draw(self, context):
+ layout = self.layout
+ st = context.space_data
+
+ layout.prop(st, "show_cache")
+
+ layout.separator()
+
+ col = layout.column()
+ col.enabled = st.show_cache
+ col.prop(st, "cache_softbody")
+ col.prop(st, "cache_particles")
+ col.prop(st, "cache_cloth")
+ col.prop(st, "cache_smoke")
+
class TIME_MT_frame(bpy.types.Menu):
bl_label = "Frame"
@@ -171,6 +193,7 @@
classes = [
TIME_HT_header,
TIME_MT_view,
+ TIME_MT_cache,
TIME_MT_frame,
TIME_MT_autokey,
TIME_MT_playback]
Modified: branches/render25/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d_toolbar.py 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/release/scripts/ui/space_view3d_toolbar.py 2010-06-22 10:52:32 UTC (rev 29610)
@@ -42,6 +42,9 @@
col.operator("transform.resize", text="Scale")
col = layout.column(align=True)
+ col.operator("object.origin_set", text="Origin")
+
+ col = layout.column(align=True)
col.label(text="Object:")
col.operator("object.duplicate_move")
col.operator("object.delete")
Modified: branches/render25/source/blender/blenkernel/BKE_key.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_key.h 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/source/blender/blenkernel/BKE_key.h 2010-06-22 10:52:32 UTC (rev 29610)
@@ -75,6 +75,8 @@
void latt_to_key(struct Lattice *lt, struct KeyBlock *kb);
void key_to_curve(struct KeyBlock *kb, struct Curve *cu, struct ListBase *nurb);
void curve_to_key(struct Curve *cu, struct KeyBlock *kb, struct ListBase *nurb);
+float (*key_to_vertcos(struct Object *ob, struct KeyBlock *kb))[3];
+void vertcos_to_key(struct Object *ob, struct KeyBlock *kb, float (*vertCos)[3]);
#ifdef __cplusplus
};
Modified: branches/render25/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_paint.h 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/source/blender/blenkernel/BKE_paint.h 2010-06-22 10:52:32 UTC (rev 29610)
@@ -70,7 +70,7 @@
int totvert, totface;
float *face_normals;
struct Object *ob;
- struct KeyBlock *kb, *refkb;
+ struct KeyBlock *kb;
/* Mesh connectivity */
struct ListBase *fmap;
@@ -94,6 +94,8 @@
struct StrokeCache *cache;
struct GPUDrawObject *drawobject;
+
+ int modifiers_active;
} SculptSession;
void free_sculptsession(struct Object *ob);
Modified: branches/render25/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_sequencer.h 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/source/blender/blenkernel/BKE_sequencer.h 2010-06-22 10:52:32 UTC (rev 29610)
@@ -191,6 +191,7 @@
int shuffle_seq_time(ListBase * seqbasep, struct Scene *evil_scene);
int seqbase_isolated_sel_check(struct ListBase *seqbase);
void free_imbuf_seq(struct Scene *scene, struct ListBase * seqbasep, int check_mem_usage);
+int seq_swap(struct Sequence *seq_a, struct Sequence *seq_b);
void seq_update_sound(struct Scene* scene, struct Sequence *seq);
void seq_update_muting(struct Scene* scene, struct Editing *ed);
@@ -200,8 +201,9 @@
struct Sequence *get_seq_by_name(struct ListBase *seqbase, const char *name, int recursive);
-struct Sequence *active_seq_get(struct Scene *scene);
-void active_seq_set(struct Scene *scene, struct Sequence *seq);
+struct Sequence *seq_active_get(struct Scene *scene);
+void seq_active_set(struct Scene *scene, struct Sequence *seq);
+int seq_active_pair_get(struct Scene *scene, struct Sequence **seq_act, struct Sequence **seq_other);
/* api for adding new sequence strips */
typedef struct SeqLoadInfo {
Modified: branches/render25/source/blender/blenkernel/BKE_texture.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_texture.h 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/source/blender/blenkernel/BKE_texture.h 2010-06-22 10:52:32 UTC (rev 29610)
@@ -64,6 +64,7 @@
void default_tex(struct Tex *tex);
struct Tex *add_texture(const char *name);
+void tex_set_type(struct Tex *tex, int type);
void default_mtex(struct MTex *mtex);
struct MTex *add_mtex(void);
struct Tex *copy_texture(struct Tex *tex);
Modified: branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c 2010-06-22 10:52:32 UTC (rev 29610)
@@ -186,6 +186,16 @@
return cddm->fmap;
}
+static int can_pbvh_draw(Object *ob, DerivedMesh *dm)
+{
+ CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
+ Mesh *me= (ob)? ob->data: NULL;
+
+ if(ob->sculpt->modifiers_active) return 0;
+
+ return (cddm->mvert == me->mvert) || ob->sculpt->kb;
+}
+
static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
@@ -200,7 +210,7 @@
return NULL;
if(ob->sculpt->pbvh) {
cddm->pbvh= ob->sculpt->pbvh;
- cddm->pbvh_draw = (cddm->mvert == me->mvert) || ob->sculpt->kb;
+ cddm->pbvh_draw = can_pbvh_draw(ob, dm);
}
/* always build pbvh from original mesh, and only use it for drawing if
@@ -208,7 +218,7 @@
that this is actually for, to support a pbvh on a modified mesh */
if(!cddm->pbvh && ob->type == OB_MESH) {
cddm->pbvh = BLI_pbvh_new();
- cddm->pbvh_draw = (cddm->mvert == me->mvert) || ob->sculpt->kb;
+ cddm->pbvh_draw = can_pbvh_draw(ob, dm);
BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
me->totface, me->totvert);
}
Modified: branches/render25/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/depsgraph.c 2010-06-22 09:53:09 UTC (rev 29609)
+++ branches/render25/source/blender/blenkernel/intern/depsgraph.c 2010-06-22 10:52:32 UTC (rev 29610)
@@ -2289,9 +2289,6 @@
/* no point in trying in this cases */
if(!id || id->us <= 1)
id= NULL;
- /* for locked shape keys we make an exception */
- else if(ob_get_key(ob) && (ob->shapeflag & OB_SHAPE_LOCK))
- id= NULL;
}
}
Modified: branches/render25/source/blender/blenkernel/intern/key.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list