Revision: 28370
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28370
Author: campbellbarton
Date: 2010-04-23 08:36:44 +0200 (Fri, 23 Apr 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28357:28368
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_object_constraint.py
branches/render25/release/scripts/ui/properties_physics_cloth.py
branches/render25/release/scripts/ui/properties_physics_field.py
branches/render25/release/scripts/ui/properties_physics_fluid.py
branches/render25/release/scripts/ui/properties_physics_smoke.py
branches/render25/release/scripts/ui/properties_physics_softbody.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/space_outliner.py
branches/render25/source/blender/blenkernel/BKE_screen.h
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/screen.c
branches/render25/source/blender/editors/include/ED_view3d.h
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_outliner/outliner_intern.h
branches/render25/source/blender/editors/space_view3d/view3d_header.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_space.c
Modified: branches/render25/release/scripts/ui/properties_object_constraint.py
===================================================================
--- branches/render25/release/scripts/ui/properties_object_constraint.py
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_object_constraint.py
2010-04-23 06:36:44 UTC (rev 28370)
@@ -37,7 +37,7 @@
# match enum type to our functions, avoids a lookup table.
getattr(self, con.type)(context, box, con, wide_ui)
- if con.type not in ('RIGID_BODY_JOINT', 'SPLINE_IK', 'NULL'):
+ if con.type not in ('RIGID_BODY_JOINT', 'NULL'):
box.prop(con, "influence")
def space_template(self, layout, con, wide_ui, target=True, owner=True):
Modified: branches/render25/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_cloth.py
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_physics_cloth.py
2010-04-23 06:36:44 UTC (rev 28370)
@@ -62,7 +62,6 @@
wide_ui = context.region.width > narrowui
split = layout.split()
- split.operator_context = 'EXEC_DEFAULT'
if md:
# remove modifier + settings
@@ -78,8 +77,6 @@
if wide_ui:
split.column()
- split.operator_context = 'INVOKE_DEFAULT'
-
if md:
cloth = md.settings
Modified: branches/render25/release/scripts/ui/properties_physics_field.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_field.py
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_physics_field.py
2010-04-23 06:36:44 UTC (rev 28370)
@@ -188,7 +188,6 @@
wide_ui = context.region.width > narrowui
split = layout.split()
- split.operator_context = 'EXEC_DEFAULT'
if md:
# remove modifier + settings
Modified: branches/render25/release/scripts/ui/properties_physics_fluid.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_fluid.py
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_physics_fluid.py
2010-04-23 06:36:44 UTC (rev 28370)
@@ -43,7 +43,6 @@
wide_ui = context.region.width > narrowui
split = layout.split(percentage=0.5)
- split.operator_context = 'EXEC_DEFAULT'
if md:
# remove modifier + settings
Modified: branches/render25/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_smoke.py
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_physics_smoke.py
2010-04-23 06:36:44 UTC (rev 28370)
@@ -48,7 +48,6 @@
wide_ui = context.region.width > narrowui
split = layout.split()
- split.operator_context = 'EXEC_DEFAULT'
if md:
# remove modifier + settings
Modified: branches/render25/release/scripts/ui/properties_physics_softbody.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_softbody.py
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_physics_softbody.py
2010-04-23 06:36:44 UTC (rev 28370)
@@ -54,7 +54,6 @@
wide_ui = context.region.width > narrowui
split = layout.split()
- split.operator_context = 'EXEC_DEFAULT'
if md:
# remove modifier + settings
Modified: branches/render25/release/scripts/ui/properties_render.py
===================================================================
--- branches/render25/release/scripts/ui/properties_render.py 2010-04-23
06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/properties_render.py 2010-04-23
06:36:44 UTC (rev 28370)
@@ -95,7 +95,7 @@
split = layout.split()
col = split.column()
- col.prop(scene, "visible_layers", text="Scene")
+ col.prop(scene, "layers", text="Scene")
if wide_ui:
col = split.column()
col.prop(rl, "visible_layers", text="Layer")
Modified: branches/render25/release/scripts/ui/space_outliner.py
===================================================================
--- branches/render25/release/scripts/ui/space_outliner.py 2010-04-23
06:33:30 UTC (rev 28369)
+++ branches/render25/release/scripts/ui/space_outliner.py 2010-04-23
06:36:44 UTC (rev 28370)
@@ -36,12 +36,13 @@
if context.area.show_menus:
sub = row.row(align=True)
sub.menu("OUTLINER_MT_view")
+ sub.menu("OUTLINER_MT_search")
if space.display_mode == 'DATABLOCKS':
sub.menu("OUTLINER_MT_edit_datablocks")
layout.prop(space, "display_mode", text="")
- layout.prop(space, "display_filter", text="")
+ layout.prop(space, "display_filter", icon='VIEWZOOM', text="")
layout.separator()
@@ -84,7 +85,19 @@
layout.operator("screen.area_dupli")
layout.operator("screen.screen_full_area")
+class OUTLINER_MT_search(bpy.types.Menu):
+ bl_label = "Search"
+ def draw(self, context):
+ layout = self.layout
+
+ space = context.space_data
+
+ col = layout.column()
+
+ col.prop(space, "match_case_sensitive")
+ col.prop(space, "match_complete")
+
class OUTLINER_MT_edit_datablocks(bpy.types.Menu):
bl_label = "Edit"
@@ -105,6 +118,7 @@
classes = [
OUTLINER_HT_header,
OUTLINER_MT_view,
+ OUTLINER_MT_search,
OUTLINER_MT_edit_datablocks]
Modified: branches/render25/source/blender/blenkernel/BKE_screen.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_screen.h 2010-04-23
06:33:30 UTC (rev 28369)
+++ branches/render25/source/blender/blenkernel/BKE_screen.h 2010-04-23
06:36:44 UTC (rev 28370)
@@ -235,6 +235,11 @@
struct ARegion *BKE_area_find_region_type(struct ScrArea *sa, int type);
+void BKE_screen_view3d_sync(struct View3D *v3d, struct Scene *scene);
+void BKE_screen_view3d_scene_sync(struct bScreen *sc);
+void BKE_screen_view3d_main_sync(ListBase *screen_lb, struct Scene *scene);
+
+
/* screen */
void free_screen(struct bScreen *sc);
unsigned int BKE_screen_visible_layers(struct bScreen *screen, struct Scene
*scene);
Modified: branches/render25/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/armature.c
2010-04-23 06:33:30 UTC (rev 28369)
+++ branches/render25/source/blender/blenkernel/intern/armature.c
2010-04-23 06:36:44 UTC (rev 28370)
@@ -2006,6 +2006,11 @@
rangle= dot_v3v3(rmat[1], splineVec);
rangle= acos( MAX2(-1.0f, MIN2(1.0f, rangle)) );
+ /* multiply the magnitude of the angle by the influence of the
constraint to
+ * control the influence of the SplineIK effect
+ */
+ rangle *= tree->con->enforce;
+
/* construct rotation matrix from the axis-angle rotation found
above
* - this call takes care to make sure that the axis
provided is a unit vector first
*/
@@ -2073,13 +2078,26 @@
}
}
- /* step 5: set the location of the bone in the matrix
- * - when the 'no-root' option is affected, the chain can retain
- * the shape but be moved elsewhere
- */
+ /* step 5: set the location of the bone in the matrix */
if (ikData->flag & CONSTRAINT_SPLINEIK_NO_ROOT) {
+ /* when the 'no-root' option is affected, the chain can retain
+ * the shape but be moved elsewhere
+ */
VECCOPY(poseHead, pchan->pose_head);
}
+ else if (tree->con->enforce < 1.0f) {
+ /* when the influence is too low
+ * - blend the positions for the 'root' bone
+ * - stick to the parent for any other
+ */
+ if (pchan->parent) {
+ VECCOPY(poseHead, pchan->pose_head);
+ }
+ else {
+ // FIXME: this introduces popping artifacts when we
reach 0.0
+ interp_v3_v3v3(poseHead, pchan->pose_head, poseHead,
tree->con->enforce);
+ }
+ }
VECCOPY(poseMat[3], poseHead);
/* finally, store the new transform */
Modified: branches/render25/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/screen.c 2010-04-23
06:33:30 UTC (rev 28369)
+++ branches/render25/source/blender/blenkernel/intern/screen.c 2010-04-23
06:36:44 UTC (rev 28370)
@@ -330,3 +330,67 @@
}
return NULL;
}
+
+void BKE_screen_view3d_sync(struct View3D *v3d, struct Scene *scene)
+{
+ int bit;
+
+ if(v3d->scenelock && v3d->localvd==NULL) {
+ v3d->lay= scene->lay;
+ v3d->camera= scene->camera;
+
+ if(v3d->camera==NULL) {
+ ARegion *ar;
+
+ for(ar=v3d->regionbase.first; ar; ar= ar->next) {
+ if(ar->regiontype == RGN_TYPE_WINDOW) {
+ RegionView3D *rv3d= ar->regiondata;
+ if(rv3d->persp==RV3D_CAMOB)
+ rv3d->persp= RV3D_PERSP;
+ }
+ }
+ }
+
+ if((v3d->lay & v3d->layact) == 0) {
+ for(bit= 0; bit<32; bit++) {
+ if(v3d->lay & (1<<bit)) {
+ v3d->layact= 1<<bit;
+ break;
+ }
+ }
+ }
+ }
+}
+
+void BKE_screen_view3d_scene_sync(bScreen *sc)
+{
+ /* are there cameras in the views that are not in the scene? */
+ ScrArea *sa;
+ for(sa= sc->areabase.first; sa; sa= sa->next) {
+ SpaceLink *sl;
+ for(sl= sa->spacedata.first; sl; sl= sl->next) {
+ if(sl->spacetype==SPACE_VIEW3D) {
+ View3D *v3d= (View3D*) sl;
+ BKE_screen_view3d_sync(v3d, sc->scene);
+ }
+ }
+ }
+}
+
+void BKE_screen_view3d_main_sync(ListBase *screen_lb, Scene *scene)
+{
+ bScreen *sc;
+ ScrArea *sa;
+ SpaceLink *sl;
+
+ /* from scene copy to the other views */
+ for(sc=screen_lb->first; sc; sc=sc->id.next) {
+ if(sc->scene!=scene)
+ continue;
+
+ for(sa=sc->areabase.first; sa; sa=sa->next)
+ for(sl=sa->spacedata.first; sl; sl=sl->next)
+ if(sl->spacetype==SPACE_VIEW3D)
+ BKE_screen_view3d_sync((View3D*)sl,
scene);
+ }
+}
Modified: branches/render25/source/blender/editors/include/ED_view3d.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
