[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27706] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r27666:27705
Campbell Barton
ideasman42 at gmail.com
Wed Mar 24 10:07:14 CET 2010
Revision: 27706
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27706
Author: campbellbarton
Date: 2010-03-24 10:07:13 +0100 (Wed, 24 Mar 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27666:27705
Modified Paths:
--------------
branches/render25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/render25/release/scripts/keyingsets/keyingsets_builtins.py
branches/render25/release/scripts/ui/properties_scene.py
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_time.py
branches/render25/release/scripts/ui/space_view3d_toolbar.py
branches/render25/source/blender/blenkernel/intern/anim_sys.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/particle.c
branches/render25/source/blender/editors/animation/fmodifier_ui.c
branches/render25/source/blender/editors/animation/keyframes_draw.c
branches/render25/source/blender/editors/animation/keyframes_edit.c
branches/render25/source/blender/editors/animation/keyframes_general.c
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/animation/keyingsets.c
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/armature/editarmature_generate.c
branches/render25/source/blender/editors/armature/editarmature_retarget.c
branches/render25/source/blender/editors/armature/editarmature_sketch.c
branches/render25/source/blender/editors/armature/meshlaplacian.c
branches/render25/source/blender/editors/armature/poseSlide.c
branches/render25/source/blender/editors/armature/poseUtils.c
branches/render25/source/blender/editors/armature/poselib.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/armature/reeb.c
branches/render25/source/blender/editors/curve/curve_ops.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/gpencil/drawgpencil.c
branches/render25/source/blender/editors/gpencil/editaction_gpencil.c
branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
branches/render25/source/blender/editors/gpencil/gpencil_edit.c
branches/render25/source/blender/editors/gpencil/gpencil_ops.c
branches/render25/source/blender/editors/gpencil/gpencil_paint.c
branches/render25/source/blender/editors/include/ED_keyframing.h
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_anim.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_icons.c
branches/render25/source/blender/editors/interface/interface_layout.c
branches/render25/source/blender/editors/interface/interface_ops.c
branches/render25/source/blender/editors/interface/interface_panel.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/interface/interface_style.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/interface_utils.c
branches/render25/source/blender/editors/interface/interface_widgets.c
branches/render25/source/blender/editors/interface/resources.c
branches/render25/source/blender/editors/interface/view2d.c
branches/render25/source/blender/editors/interface/view2d_ops.c
branches/render25/source/blender/editors/mesh/editface.c
branches/render25/source/blender/editors/mesh/editmesh.c
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/editmesh_lib.c
branches/render25/source/blender/editors/mesh/editmesh_loop.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/loopcut.c
branches/render25/source/blender/editors/mesh/mesh_data.c
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/metaball/mball_edit.c
branches/render25/source/blender/editors/metaball/mball_ops.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_bake.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_hook.c
branches/render25/source/blender/editors/object/object_lattice.c
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/object/object_select.c
branches/render25/source/blender/editors/object/object_shapekey.c
branches/render25/source/blender/editors/object/object_transform.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/physics/particle_boids.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/physics/particle_object.c
branches/render25/source/blender/editors/physics/physics_fluid.c
branches/render25/source/blender/editors/physics/physics_ops.c
branches/render25/source/blender/editors/physics/physics_pointcache.c
branches/render25/source/blender/editors/render/render_internal.c
branches/render25/source/blender/editors/render/render_opengl.c
branches/render25/source/blender/editors/render/render_ops.c
branches/render25/source/blender/editors/render/render_preview.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/glutil.c
branches/render25/source/blender/editors/screen/screen_context.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/screen/screendump.c
branches/render25/source/blender/editors/sculpt_paint/paint_image.c
branches/render25/source/blender/editors/sculpt_paint/paint_ops.c
branches/render25/source/blender/editors/sculpt_paint/paint_stroke.c
branches/render25/source/blender/editors/sculpt_paint/paint_utils.c
branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_action/action_draw.c
branches/render25/source/blender/editors/space_action/action_edit.c
branches/render25/source/blender/editors/space_action/action_ops.c
branches/render25/source/blender/editors/space_action/action_select.c
branches/render25/source/blender/editors/space_action/space_action.c
branches/render25/source/blender/editors/space_api/space.c
branches/render25/source/blender/editors/space_api/spacetypes.c
branches/render25/source/blender/editors/space_buttons/buttons_context.c
branches/render25/source/blender/editors/space_buttons/buttons_header.c
branches/render25/source/blender/editors/space_buttons/buttons_ops.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_console/console_draw.c
branches/render25/source/blender/editors/space_console/console_ops.c
branches/render25/source/blender/editors/space_console/console_report.c
branches/render25/source/blender/editors/space_console/space_console.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/file_panels.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_file/writeimage.c
branches/render25/source/blender/editors/space_graph/graph_buttons.c
branches/render25/source/blender/editors/space_graph/graph_draw.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_graph/graph_ops.c
branches/render25/source/blender/editors/space_graph/graph_select.c
branches/render25/source/blender/editors/space_graph/graph_utils.c
branches/render25/source/blender/editors/space_graph/space_graph.c
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/space_image/image_draw.c
branches/render25/source/blender/editors/space_image/image_header.c
branches/render25/source/blender/editors/space_image/image_intern.h
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_image/image_render.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_info/info_ops.c
branches/render25/source/blender/editors/space_info/info_stats.c
branches/render25/source/blender/editors/space_info/space_info.c
branches/render25/source/blender/editors/space_logic/logic_buttons.c
branches/render25/source/blender/editors/space_logic/logic_header.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_logic/space_logic.c
branches/render25/source/blender/editors/space_nla/nla_buttons.c
branches/render25/source/blender/editors/space_nla/nla_channels.c
branches/render25/source/blender/editors/space_nla/nla_draw.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_nla/nla_ops.c
branches/render25/source/blender/editors/space_nla/nla_select.c
branches/render25/source/blender/editors/space_nla/space_nla.c
branches/render25/source/blender/editors/space_node/drawnode.c
branches/render25/source/blender/editors/space_node/node_buttons.c
branches/render25/source/blender/editors/space_node/node_draw.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_node/node_header.c
branches/render25/source/blender/editors/space_node/node_ops.c
branches/render25/source/blender/editors/space_node/node_select.c
branches/render25/source/blender/editors/space_node/node_state.c
branches/render25/source/blender/editors/space_node/space_node.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_outliner/outliner_ops.c
branches/render25/source/blender/editors/space_outliner/space_outliner.c
branches/render25/source/blender/editors/space_script/script_edit.c
branches/render25/source/blender/editors/space_script/script_header.c
branches/render25/source/blender/editors/space_script/script_ops.c
branches/render25/source/blender/editors/space_script/space_script.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_sequencer/sequencer_buttons.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_ops.c
branches/render25/source/blender/editors/space_sequencer/sequencer_select.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_sound/sound_header.c
branches/render25/source/blender/editors/space_sound/space_sound.c
branches/render25/source/blender/editors/space_text/space_text.c
branches/render25/source/blender/editors/space_text/text_header.c
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_text/text_python.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/editors/space_time/time_ops.c
branches/render25/source/blender/editors/space_userpref/space_userpref.c
branches/render25/source/blender/editors/space_view3d/drawanimviz.c
branches/render25/source/blender/editors/space_view3d/drawarmature.c
branches/render25/source/blender/editors/space_view3d/drawmesh.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/drawvolume.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/space_view3d/view3d_buttons.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_header.c
branches/render25/source/blender/editors/space_view3d/view3d_ops.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/editors/space_view3d/view3d_snap.c
branches/render25/source/blender/editors/space_view3d/view3d_toolbar.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform_constraints.c
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_input.c
branches/render25/source/blender/editors/transform/transform_manipulator.c
branches/render25/source/blender/editors/transform/transform_ndofinput.c
branches/render25/source/blender/editors/transform/transform_ops.c
branches/render25/source/blender/editors/transform/transform_orientations.c
branches/render25/source/blender/editors/transform/transform_snap.c
branches/render25/source/blender/editors/util/ed_util.c
branches/render25/source/blender/editors/util/editmode_undo.c
branches/render25/source/blender/editors/util/numinput.c
branches/render25/source/blender/editors/util/undo.c
branches/render25/source/blender/editors/uvedit/uvedit_draw.c
branches/render25/source/blender/editors/uvedit/uvedit_ops.c
branches/render25/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesrna/intern/rna_animation.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/windowmanager/intern/wm.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/render25/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/render25/source/gameengine/Ketsji/KX_Scene.cpp
branches/render25/source/gameengine/Ketsji/KX_Scene.h
Modified: branches/render25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2010-03-24 09:07:13 UTC (rev 27706)
@@ -647,6 +647,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\image_gen.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\implicit.c"
>
</File>
Modified: branches/render25/release/scripts/keyingsets/keyingsets_builtins.py
===================================================================
--- branches/render25/release/scripts/keyingsets/keyingsets_builtins.py 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/release/scripts/keyingsets/keyingsets_builtins.py 2010-03-24 09:07:13 UTC (rev 27706)
@@ -11,8 +11,7 @@
# Location
class BUILTIN_KSI_Location(bpy.types.KeyingSetInfo):
- bl_idname = "Location"
- bl_builtin = True
+ bl_label = "Location"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -25,8 +24,7 @@
# Rotation
class BUILTIN_KSI_Rotation(bpy.types.KeyingSetInfo):
- bl_idname = "Rotation"
- bl_builtin = True
+ bl_label = "Rotation"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -39,8 +37,7 @@
# Scale
class BUILTIN_KSI_Scaling(bpy.types.KeyingSetInfo):
- bl_idname = "Scaling"
- bl_builtin = True
+ bl_label = "Scaling"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -55,8 +52,7 @@
# LocRot
class BUILTIN_KSI_LocRot(bpy.types.KeyingSetInfo):
- bl_idname = "LocRot"
- bl_builtin = True
+ bl_label = "LocRot"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -73,8 +69,7 @@
# LocScale
class BUILTIN_KSI_LocScale(bpy.types.KeyingSetInfo):
- bl_idname = "LocScale"
- bl_builtin = True
+ bl_label = "LocScale"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -91,8 +86,7 @@
# LocRotScale
class BUILTIN_KSI_LocRotScale(bpy.types.KeyingSetInfo):
- bl_idname = "LocRotScale"
- bl_builtin = True
+ bl_label = "LocRotScale"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -111,8 +105,7 @@
# RotScale
class BUILTIN_KSI_RotScale(bpy.types.KeyingSetInfo):
- bl_idname = "RotScale"
- bl_builtin = True
+ bl_label = "RotScale"
# poll - use predefined callback for selected bones/objects
poll = RKS_POLL_selected_items
@@ -131,8 +124,7 @@
# Location
class BUILTIN_KSI_VisualLoc(bpy.types.KeyingSetInfo):
- bl_idname = "Visual Location"
- bl_builtin = True
+ bl_label = "Visual Location"
insertkey_visual = True
@@ -147,8 +139,7 @@
# Rotation
class BUILTIN_KSI_VisualRot(bpy.types.KeyingSetInfo):
- bl_idname = "Visual Rotation"
- bl_builtin = True
+ bl_label = "Visual Rotation"
insertkey_visual = True
@@ -163,8 +154,7 @@
# VisualLocRot
class BUILTIN_KSI_VisualLocRot(bpy.types.KeyingSetInfo):
- bl_idname = "Visual LocRot"
- bl_builtin = True
+ bl_label = "Visual LocRot"
insertkey_visual = True
@@ -185,8 +175,7 @@
# Available
class BUILTIN_KSI_Available(bpy.types.KeyingSetInfo):
- bl_idname = "Available"
- bl_builtin = True
+ bl_label = "Available"
# poll - use predefined callback for selected objects
# TODO: this should really check whether the selected object (or datablock)
Modified: branches/render25/release/scripts/ui/properties_scene.py
===================================================================
--- branches/render25/release/scripts/ui/properties_scene.py 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/release/scripts/ui/properties_scene.py 2010-03-24 09:07:13 UTC (rev 27706)
@@ -101,7 +101,6 @@
col = row.column()
col.prop(ks, "name")
- col.prop(ks, "absolute")
subcol = col.column()
subcol.operator_context = 'INVOKE_DEFAULT'
Modified: branches/render25/release/scripts/ui/space_image.py
===================================================================
--- branches/render25/release/scripts/ui/space_image.py 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/release/scripts/ui/space_image.py 2010-03-24 09:07:13 UTC (rev 27706)
@@ -406,7 +406,21 @@
layout.template_histogram(sima, "histogram")
+class IMAGE_PT_sample_line(bpy.types.Panel):
+ bl_space_type = 'IMAGE_EDITOR'
+ bl_region_type = 'PREVIEW'
+ bl_label = "Sample Line"
+ def poll(self, context):
+ sima = context.space_data
+ return (sima and sima.image)
+
+ def draw(self, context):
+ layout = self.layout
+ layout.operator("image.sample_line")
+ sima = context.space_data
+ layout.template_histogram(sima, "sample_histogram")
+
class IMAGE_PT_view_properties(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'
bl_region_type = 'UI'
@@ -592,7 +606,8 @@
IMAGE_PT_paint_curve,
IMAGE_PT_game_properties,
IMAGE_PT_view_properties,
- IMAGE_PT_view_histogram]
+ IMAGE_PT_view_histogram,
+ IMAGE_PT_sample_line]
def register():
Modified: branches/render25/release/scripts/ui/space_time.py
===================================================================
--- branches/render25/release/scripts/ui/space_time.py 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/release/scripts/ui/space_time.py 2010-03-24 09:07:13 UTC (rev 27706)
@@ -77,7 +77,7 @@
layout.separator()
row = layout.row(align=True)
- row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="")
+ row.prop_object(scene, "active_keying_set", scene, "all_keying_sets", text="")
row.operator("anim.keyframe_insert", text="", icon='KEY_HLT')
row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
Modified: branches/render25/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d_toolbar.py 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/release/scripts/ui/space_view3d_toolbar.py 2010-03-24 09:07:13 UTC (rev 27706)
@@ -1018,12 +1018,15 @@
col.active = pe.editable
col.label(text="Draw:")
col.prop(pe, "draw_step", text="Path Steps")
- if pe.type == 'PARTICLES':
- col.prop(pe, "draw_particles", text="Particles")
- col.prop(pe, "fade_time")
- sub = col.row()
- sub.active = pe.fade_time
- sub.prop(pe, "fade_frames", slider=True)
+ if pe.hair:
+ col.prop(pe, "draw_particles", text="Children")
+ else:
+ if pe.type == 'PARTICLES':
+ col.prop(pe, "draw_particles", text="Particles")
+ col.prop(pe, "fade_time")
+ sub = col.row()
+ sub.active = pe.fade_time
+ sub.prop(pe, "fade_frames", slider=True)
classes = [
Modified: branches/render25/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim_sys.c 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/source/blender/blenkernel/intern/anim_sys.c 2010-03-24 09:07:13 UTC (rev 27706)
@@ -769,11 +769,11 @@
/* Write the given value to a setting using RNA, and return success */
static short animsys_write_rna_setting (PointerRNA *ptr, char *path, int array_index, float value)
{
- // printf("%p %s %i %f\n", ptr, path, array_index, value);
-
PropertyRNA *prop;
PointerRNA new_ptr;
+ //printf("%p %s %i %f\n", ptr, path, array_index, value);
+
/* get property to write to */
if (RNA_path_resolve(ptr, path, &new_ptr, &prop))
{
@@ -781,7 +781,7 @@
if (RNA_property_animateable(&new_ptr, prop))
{
int array_len= RNA_property_array_length(&new_ptr, prop);
-
+
if(array_len && array_index >= array_len)
{
if (G.f & G_DEBUG) {
@@ -789,10 +789,10 @@
(ptr && ptr->id.data) ? (((ID *)ptr->id.data)->name+2) : "<No ID>",
path, array_index, array_len-1);
}
-
+
return 0;
}
-
+
switch (RNA_property_type(prop))
{
case PROP_BOOLEAN:
@@ -1003,7 +1003,12 @@
animsys_evaluate_fcurves(&strip_ptr, &strip->fcurves, NULL, ctime);
}
- if (strip->flag & NLASTRIP_FLAG_USR_TIME && strip->flag & NLASTRIP_FLAG_USR_TIME_CYCLIC)
+ /* if user can control the evaluation time (using F-Curves), consider the option which allows this time to be clamped
+ * to lie within extents of the action-clip, so that a steady changing rate of progress through several cycles of the clip
+ * can be achieved easily
+ */
+ // NOTE: if we add any more of these special cases, we better group them up nicely...
+ if ((strip->flag & NLASTRIP_FLAG_USR_TIME) && (strip->flag & NLASTRIP_FLAG_USR_TIME_CYCLIC))
strip->strip_time= fmod(strip->strip_time - strip->actstart, strip->actend - strip->actstart);
}
@@ -1740,7 +1745,7 @@
*/
// TODO: need to double check that this all works correctly
if ((recalc & ADT_RECALC_ANIM) || (adt->recalc & ADT_RECALC_ANIM))
- {
+ {
/* evaluate NLA data */
if ((adt->nla_tracks.first) && !(adt->flag & ADT_NLA_EVAL_OFF))
{
Modified: branches/render25/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-24 03:48:25 UTC (rev 27705)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-24 09:07:13 UTC (rev 27706)
@@ -42,6 +42,7 @@
#include "BLI_kdtree.h"
#include "BLI_rand.h"
+#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h"
@@ -3673,6 +3674,7 @@
Object *ob; /* object this projector is derived from */
float projmat[4][4]; /* projection matrix */
float normal[3]; /* projector normal in world space */
+ void *uci; /* optional uv-project info (panorama projection) */
} Projector;
static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
@@ -3688,9 +3690,11 @@
int num_projectors = 0;
float aspect;
char uvname[32];
+ float aspx= umd->aspectx ? 1.0f : umd->aspectx;
+ float aspy= umd->aspecty ? 1.0f : umd->aspecty;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list