[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43018] branches/bmesh/blender: svn merge ^/trunk/blender -r42991:43009
Campbell Barton
ideasman42 at gmail.com
Sat Dec 31 04:07:24 CET 2011
Revision: 43018
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43018
Author: campbellbarton
Date: 2011-12-31 03:07:14 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42991:43009
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42991
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/modules/bpy/utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/include/BIF_glutil.h
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/object/object_constraint.c
branches/bmesh/blender/source/blender/editors/object/object_intern.h
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/render/render_internal.c
branches/bmesh/blender/source/blender/editors/render/render_preview.c
branches/bmesh/blender/source/blender/editors/screen/glutil.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_editor.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_draw.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_intern.h
branches/bmesh/blender/source/blender/editors/space_clip/clip_utils.c
branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
branches/bmesh/blender/source/blender/imbuf/intern/divers.c
branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_image_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_image.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/gameengine/Expressions/StringValue.h
branches/bmesh/blender/source/gameengine/Expressions/Value.h
branches/bmesh/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/bmesh/blender/source/gameengine/Ketsji/BL_Material.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_Texture.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Dome.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_FontObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_FontObject.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.h
Added Paths:
-----------
branches/bmesh/blender/release/scripts/presets/tracking_track_color/object.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42991
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43009
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-42991
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43009
Modified: branches/bmesh/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy/utils.py 2011-12-31 03:01:18 UTC (rev 43017)
+++ branches/bmesh/blender/release/scripts/modules/bpy/utils.py 2011-12-31 03:07:14 UTC (rev 43018)
@@ -349,6 +349,14 @@
raise Exception("invalid subdir given %r" % subdir)
elif _os.path.isdir(directory):
dirs.append(directory)
+
+ # Find addons preset paths
+ import addon_utils
+ for path in addon_utils.paths():
+ directory = _os.path.join(path, "presets", subdir)
+ if _os.path.isdir(directory):
+ dirs.append(directory)
+
return dirs
Copied: branches/bmesh/blender/release/scripts/presets/tracking_track_color/object.py (from rev 43009, trunk/blender/release/scripts/presets/tracking_track_color/object.py)
===================================================================
--- branches/bmesh/blender/release/scripts/presets/tracking_track_color/object.py (rev 0)
+++ branches/bmesh/blender/release/scripts/presets/tracking_track_color/object.py 2011-12-31 03:07:14 UTC (rev 43018)
@@ -0,0 +1,5 @@
+import bpy
+track = bpy.context.edit_movieclip.tracking.tracks.active
+
+track.color = (1.0, 0.0, 1.0)
+track.use_custom_color = True
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py 2011-12-31 03:01:18 UTC (rev 43017)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py 2011-12-31 03:07:14 UTC (rev 43018)
@@ -76,6 +76,7 @@
if hasattr(self, "add"):
self.add(context, filepath)
else:
+ print("Writing Preset: %r" % filepath)
file_preset = open(filepath, 'w')
file_preset.write("import bpy\n")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-12-31 03:01:18 UTC (rev 43017)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-12-31 03:07:14 UTC (rev 43018)
@@ -755,7 +755,16 @@
col = layout.column()
col.prop(con, "rotation_range", text="Pivot When")
+ @staticmethod
+ def _getConstraintClip(context, con):
+ if not con.use_active_clip:
+ return con.clip
+ else:
+ return context.scene.active_clip
+
def FOLLOW_TRACK(self, context, layout, con):
+ clip = self._getConstraintClip(context, con)
+
row = layout.row()
row.prop(con, "use_active_clip")
row.prop(con, "use_3d_position")
@@ -763,8 +772,12 @@
if not con.use_active_clip:
layout.prop(con, "clip")
- layout.prop(con, "track")
+ if clip:
+ layout.prop_search(con, "object", clip.tracking, "objects", icon='OBJECT_DATA')
+ layout.prop_search(con, "track", clip.tracking, "tracks", icon='ANIMATION_DATA')
+ layout.prop(con, "camera")
+
layout.operator("clip.constraint_to_fcurve")
def CAMERA_SOLVER(self, context, layout, con):
@@ -775,6 +788,26 @@
layout.operator("clip.constraint_to_fcurve")
+ def OBJECT_SOLVER(self, context, layout, con):
+ scene = context.scene
+ clip = self._getConstraintClip(context, con)
+
+ layout.prop(con, "use_active_clip")
+
+ if not con.use_active_clip:
+ layout.prop(con, "clip")
+
+ if clip:
+ layout.prop_search(con, "object", clip.tracking, "objects", icon='OBJECT_DATA')
+
+ layout.prop(con, "camera")
+
+ row = layout.row()
+ row.operator("constraint.objectsolver_set_inverse")
+ row.operator("constraint.objectsolver_clear_inverse")
+
+ layout.operator("clip.constraint_to_fcurve")
+
def SCRIPT(self, context, layout, con):
layout.label("Blender 2.5 has no py-constraints")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py 2011-12-31 03:01:18 UTC (rev 43017)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py 2011-12-31 03:07:14 UTC (rev 43018)
@@ -316,6 +316,9 @@
col = split.column()
col.prop(rd, "use_raytrace", text="Ray Tracing")
col.prop(rd, "use_color_management")
+ sub = col.row()
+ sub.active = rd.use_color_management == True
+ sub.prop(rd, "use_color_unpremultiply")
col.prop(rd, "alpha_mode", text="Alpha")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2011-12-31 03:01:18 UTC (rev 43017)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2011-12-31 03:07:14 UTC (rev 43018)
@@ -70,8 +70,14 @@
row.template_ID(sc, "clip", open='clip.open')
if clip:
- r = clip.tracking.reconstruction
+ tracking = clip.tracking
+ active = tracking.objects.active
+ if active and not active.is_camera:
+ r = active.reconstruction
+ else:
+ r = tracking.reconstruction
+
if r.is_valid:
layout.label(text="Average solve error: %.4f" %
(r.average_error))
@@ -197,10 +203,18 @@
def draw(self, context):
layout = self.layout
clip = context.space_data.clip
- settings = clip.tracking.settings
+ tracking = clip.tracking
+ settings = tracking.settings
+ tracking_object = tracking.objects.active
col = layout.column(align=True)
- col.operator("clip.solve_camera", text="Camera Motion")
+
+ if tracking_object.is_camera:
+ solve_text = "Camera Motion"
+ else:
+ solve_text = "Object Motion"
+
+ col.operator("clip.solve_camera", text=solve_text)
col.operator("clip.clear_solution")
col = layout.column(align=True)
@@ -208,6 +222,7 @@
col.prop(settings, "keyframe_b")
col = layout.column(align=True)
+ col.active = tracking_object.is_camera
col.label(text="Refine:")
col.prop(settings, "refine_intrinsics", text="")
@@ -287,6 +302,39 @@
col.prop(settings, "distance")
+class CLIP_PT_tools_object(Panel):
+ bl_space_type = 'CLIP_EDITOR'
+ bl_region_type = 'TOOLS'
+ bl_label = "Object"
+
+ @classmethod
+ def poll(cls, context):
+ sc = context.space_data
+ clip = sc.clip
+
+ if clip and sc.mode == 'RECONSTRUCTION':
+ tracking_object = clip.tracking.objects.active
+ return not tracking_object.is_camera
+
+ return False
+
+ def draw(self, context):
+ sc = context.space_data
+ clip = sc.clip
+ layout = self.layout
+ tracking_object = clip.tracking.objects.active
+ settings = sc.clip.tracking.settings
+
+ col = layout.column()
+
+ col.prop(tracking_object, "scale")
+
+ col.separator()
+
+ col.operator("clip.set_solution_scale", text="Set Scale")
+ col.prop(settings, "object_distance")
+
+
class CLIP_PT_tools_grease_pencil(Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'TOOLS'
@@ -316,6 +364,37 @@
row.prop(context.tool_settings, "use_grease_pencil_sessions")
+class CLIP_PT_objects(Panel):
+ bl_space_type = 'CLIP_EDITOR'
+ bl_region_type = 'UI'
+ bl_label = "Objects"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ sc = context.space_data
+
+ return sc.clip
+
+ def draw(self, context):
+ layout = self.layout
+ sc = context.space_data
+ clip = context.space_data.clip
+ tracking = clip.tracking
+
+ row = layout.row()
+ row.template_list(tracking, "objects", tracking, "active_object_index", rows=3)
+
+ sub = row.column(align=True)
+
+ sub.operator("clip.tracking_object_new", icon='ZOOMIN', text="")
+ sub.operator("clip.tracking_object_remove", icon='ZOOMOUT', text="")
+
+ active = tracking.objects.active
+ if active:
+ layout.prop(active, "name")
+
+
class CLIP_PT_track(Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'UI'
@@ -352,10 +431,16 @@
layout.template_track(sc, "scopes")
row = layout.row(align=True)
- row.prop(act_track, "use_red_channel", text="R", toggle=True)
- row.prop(act_track, "use_green_channel", text="G", toggle=True)
- row.prop(act_track, "use_blue_channel", text="B", toggle=True)
+ sub = row.row()
+ sub.prop(act_track, "use_red_channel", text="R", toggle=True)
+ sub.prop(act_track, "use_green_channel", text="G", toggle=True)
+ sub.prop(act_track, "use_blue_channel", text="B", toggle=True)
+ row.separator()
+
+ sub = row.row()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list