sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

cmake & pep8 tidy up, also some style edits.

Browse Source 
remove unneeded collection length function.
This commit is contained in:
Campbell Barton 2011-11-08 01:32:34 +00:00
parent 95948d0e0e
commit f086201518
26 changed files with 101 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/python_api/examples/bpy.app.handlers.1.py
View File

@ -15,6 +15,6 @@ from bpy.app.handlers import persistent
@persistent
def load_handler(dummy):
print("Load Handler:", bpy.data.filepath)
print("Load Handler:", bpy.data.filepath)
bpy.app.handlers.load_post.append(load_handler)

3
doc/python_api/examples/bpy.app.handlers.py
View File

@ -6,7 +6,8 @@ This script shows the most simple example of adding a handler.
import bpy
def my_handler(scene):
print("Frame Change", scene.frame_current)
print("Frame Change", scene.frame_current)
bpy.app.handlers.frame_change_pre.append(my_handler)

24
extern/libmv/CMakeLists.txt vendored
View File

@ -25,8 +25,8 @@
set(INC
.
../Eigen3
./third_party/ssba
./third_party/ldl/Include
third_party/ssba
third_party/ldl/Include
../colamd/Include
)
@ -130,7 +130,7 @@ set(SRC
third_party/msinttypes/inttypes.h
)
IF(WIN32)
if(WIN32)
list(APPEND SRC
third_party/glog/src/logging.cc
third_party/glog/src/raw_logging.cc
@ -158,23 +158,23 @@ IF(WIN32)
)
list(APPEND INC
./third_party/glog/src/windows
third_party/glog/src/windows
)
IF(NOT MINGW)
if(NOT MINGW)
list(APPEND INC
./third_party/msinttypes
third_party/msinttypes
)
ENDIF(NOT MINGW)
endif()
IF(MSVC)
if(MSVC)
set(MSVC_OFLAGS O1 O2 Ox)
foreach(FLAG )
string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
endforeach()
ENDIF(MSVC)
ELSE(WIN32)
endif()
else(WIN32)
list(APPEND SRC
third_party/glog/src/utilities.cc
third_party/glog/src/symbolize.cc
@ -206,9 +206,9 @@ ELSE(WIN32)
)
list(APPEND INC
./third_party/glog/src
third_party/glog/src
)
ENDIF(WIN32)
endif()
add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)

4
release/scripts/modules/bpy/ops.py
View File

@ -208,7 +208,7 @@ class BPyOpsSubModOp(object):
return "# %s\n%s" % (descr, as_string)
def __str__(self): # used for print(...)
return "<function bpy.ops.%s.%s at 0x%x'>" % \
(self.module, self.func, id(self))
return ("<function bpy.ops.%s.%s at 0x%x'>" %
(self.module, self.func, id(self)))
ops_fake_module = BPyOps()

6
release/scripts/modules/bpyml_ui.py
View File

@ -25,9 +25,11 @@ from bpyml import TAG, ARGS, CHILDREN
_uilayout_rna = _bpy.types.UILayout.bl_rna
_uilayout_tags = ["ui"] + \
_uilayout_rna.properties.keys() + \
_uilayout_tags = (
["ui"] +
_uilayout_rna.properties.keys() +
_uilayout_rna.functions.keys()
)
# these need to be imported directly
# >>> from bpyml_ui.locals import *

9
release/scripts/startup/bl_operators/clip.py
View File

@ -155,7 +155,8 @@ class CLIP_OT_delete_proxy(Operator):
self._rmproxy(d + '_undistorted')
self._rmproxy(os.path.join(absproxy, 'proxy_' + str(x) + '.avi'))
tc = ('free_run.blen_tc', 'interp_free_run.blen_tc', \
tc = ('free_run.blen_tc',
'interp_free_run.blen_tc',
'record_run.blen_tc')
for x in tc:
@ -280,10 +281,10 @@ class CLIP_OT_constraint_to_fcurve(Operator):
efra = max(efra, track.markers[-1].frame)
if sfra is None or efra is None:
return
return
# Store object matrices
for x in range(sfra, efra+1):
for x in range(sfra, efra + 1):
scene.frame_set(x)
matrices.append(ob.matrix_world.copy())
@ -291,7 +292,7 @@ class CLIP_OT_constraint_to_fcurve(Operator):
# Apply matrices on object and insert keyframes
i = 0
for x in range(sfra, efra+1):
for x in range(sfra, efra + 1):
scene.frame_set(x)
ob.matrix_world = matrices[i]

3
release/scripts/startup/bl_operators/object_quick_effects.py
View File

@ -105,8 +105,7 @@ class QuickFur(Operator):
psys.settings.child_type = 'INTERPOLATED'
obj.data.materials.append(mat)
obj.particle_systems[-1].settings.material = \
len(obj.data.materials)
psys.settings.material = len(obj.data.materials)
return {'FINISHED'}

18
release/scripts/startup/bl_operators/uvcalc_smart_project.py
View File

@ -212,8 +212,11 @@ def islandIntersectUvIsland(source, target, SourceOffset):
# Edge intersect test
for ed in edgeLoopsSource:
for seg in edgeLoopsTarget:
i = geometry.intersect_line_line_2d(\
seg[0], seg[1], SourceOffset+ed[0], SourceOffset+ed[1])
i = geometry.intersect_line_line_2d(seg[0],
seg[1],
SourceOffset+ed[0],
SourceOffset+ed[1],
)
if i:
return 1 # LINE INTERSECTION
@ -773,15 +776,16 @@ def main_consts():
global ROTMAT_2D_POS_45D
global RotMatStepRotation
ROTMAT_2D_POS_90D = Matrix.Rotation( radians(90.0), 2)
ROTMAT_2D_POS_45D = Matrix.Rotation( radians(45.0), 2)
ROTMAT_2D_POS_90D = Matrix.Rotation(radians(90.0), 2)
ROTMAT_2D_POS_45D = Matrix.Rotation(radians(45.0), 2)
RotMatStepRotation = []
rot_angle = 22.5 #45.0/2
while rot_angle > 0.1:
RotMatStepRotation.append([\
Matrix.Rotation( radians(rot_angle), 2),\
Matrix.Rotation( radians(-rot_angle), 2)])
RotMatStepRotation.append([
Matrix.Rotation(radians(+rot_angle), 2),
Matrix.Rotation(radians(-rot_angle), 2),
])
rot_angle = rot_angle/2.0

7
release/scripts/startup/bl_ui/properties_data_camera.py
View File

@ -108,6 +108,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel):
col.prop(cam, "clip_start", text="Start")
col.prop(cam, "clip_end", text="End")
class DATA_PT_camera(CameraButtonsPanel, Panel):
bl_label = "Camera"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@ -120,8 +121,8 @@ class DATA_PT_camera(CameraButtonsPanel, Panel):
row = layout.row(align=True)
row.menu("CAMERA_MT_presets", text=bpy.types.CAMERA_MT_presets.bl_label)
row.operator("camera.preset_add", text="", icon="ZOOMIN")
row.operator("camera.preset_add", text="", icon="ZOOMOUT").remove_active = True
row.operator("camera.preset_add", text="", icon='ZOOMIN')
row.operator("camera.preset_add", text="", icon='ZOOMOUT').remove_active = True
layout.label(text="Sensor:")
@ -137,6 +138,7 @@ class DATA_PT_camera(CameraButtonsPanel, Panel):
col = split.column(align=True)
col.prop(cam, "sensor_fit", text="")
class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
bl_label = "Depth of Field"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@ -156,6 +158,7 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
col.active = cam.dof_object is None
col.prop(cam, "dof_distance", text="Distance")
class DATA_PT_camera_display(CameraButtonsPanel, Panel):
bl_label = "Display"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}

4
release/scripts/startup/bl_ui/properties_data_lamp.py
View File

@ -134,8 +134,8 @@ class DATA_PT_sunsky(DataButtonsPanel, Panel):
row = layout.row(align=True)
row.prop(lamp, "use_sky")
row.menu("LAMP_MT_sunsky_presets", text=bpy.types.LAMP_MT_sunsky_presets.bl_label)
row.operator("lamp.sunsky_preset_add", text="", icon="ZOOMIN")
row.operator("lamp.sunsky_preset_add", text="", icon="ZOOMOUT").remove_active = True
row.operator("lamp.sunsky_preset_add", text="", icon='ZOOMIN')
row.operator("lamp.sunsky_preset_add", text="", icon='ZOOMOUT').remove_active = True
row = layout.row()
row.active = lamp.use_sky or lamp.use_atmosphere

7
release/scripts/startup/bl_ui/properties_game.py
View File

@ -315,11 +315,9 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
split = layout.split()
if dome_type == 'FISHEYE' or \
dome_type == 'TRUNCATED_REAR' or \
dome_type == 'TRUNCATED_FRONT':
if dome_type in {'FISHEYE', 'TRUNCATED_REAR', 'TRUNCATED_FRONT'}:
col = split.column()
col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
col.prop(gs, "dome_angle", slider=True)
@ -336,6 +334,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
else: # cube map
col = split.column()
col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
col = split.column()

6
release/scripts/startup/bl_ui/properties_material.py
View File

@ -124,7 +124,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel, Panel):
split.template_ID(ob, "active_material", new="material.new")
row = split.row()
if mat:
row.prop(mat, "use_nodes", icon="NODETREE", text="")
row.prop(mat, "use_nodes", icon='NODETREE', text="")
if slot:
row.prop(slot, "link", text="")
@ -501,8 +501,8 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, Panel):
row = layout.row().split()
sub = row.row(align=True).split(percentage=0.75)
sub.menu("MATERIAL_MT_sss_presets", text=bpy.types.MATERIAL_MT_sss_presets.bl_label)
sub.operator("material.sss_preset_add", text="", icon="ZOOMIN")
sub.operator("material.sss_preset_add", text="", icon="ZOOMOUT").remove_active = True
sub.operator("material.sss_preset_add", text="", icon='ZOOMIN')
sub.operator("material.sss_preset_add", text="", icon='ZOOMOUT').remove_active = True
split = layout.split()

4
release/scripts/startup/bl_ui/properties_object.py
View File

@ -267,12 +267,12 @@ class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel):
ob = context.object
split = layout.split()
col = split.column()
col.label(text="Tracking Axes:")
col.prop(ob, "track_axis", text="Axis")
col.prop(ob, "up_axis", text="Up Axis")
col = split.column()
col.prop(ob, "use_slow_parent")
row = col.row()

4
release/scripts/startup/bl_ui/properties_physics_cloth.py
View File

@ -73,8 +73,8 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel):
col.label(text="Presets:")
sub = col.row(align=True)
sub.menu("CLOTH_MT_presets", text=bpy.types.CLOTH_MT_presets.bl_label)
sub.operator("cloth.preset_add", text="", icon="ZOOMIN")
sub.operator("cloth.preset_add", text="", icon="ZOOMOUT").remove_active = True
sub.operator("cloth.preset_add", text="", icon='ZOOMIN')
sub.operator("cloth.preset_add", text="", icon='ZOOMOUT').remove_active = True
col.label(text="Quality:")
col.prop(cloth, "quality", text="Steps", slider=True)

4
release/scripts/startup/bl_ui/properties_physics_fluid.py
View File

@ -206,7 +206,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
col = split.column()
if scene.use_gravity:
col.label(text="Use Scene Gravity", icon="SCENE_DATA")
col.label(text="Use Scene Gravity", icon='SCENE_DATA')
sub = col.column()
sub.enabled = False
sub.prop(fluid, "gravity", text="")
@ -215,7 +215,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
col.prop(fluid, "gravity", text="")
if scene.unit_settings.system != 'NONE':
col.label(text="Use Scene Size Units", icon="SCENE_DATA")
col.label(text="Use Scene Size Units", icon='SCENE_DATA')
sub = col.column()
sub.enabled = False
sub.prop(fluid, "simulation_scale", text="Metres")

4
release/scripts/startup/bl_ui/properties_render.py
View File

@ -186,8 +186,8 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel):
row = layout.row(align=True)
row.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
row.operator("render.preset_add", text="", icon="ZOOMIN")
row.operator("render.preset_add", text="", icon="ZOOMOUT").remove_active = True
row.operator("render.preset_add", text="", icon='ZOOMIN')
row.operator("render.preset_add", text="", icon='ZOOMOUT').remove_active = True
split = layout.split()

22
release/scripts/startup/bl_ui/space_clip.py
View File

@ -312,10 +312,10 @@ class CLIP_PT_track(Panel):
row = layout.row(align=True)
label = bpy.types.CLIP_MT_track_color_presets.bl_label
row.menu('CLIP_MT_track_color_presets', text=label)
row.menu('CLIP_MT_track_color_specials', text="", icon="DOWNARROW_HLT")
row.operator("clip.track_color_preset_add", text="", icon="ZOOMIN")
row.menu('CLIP_MT_track_color_specials', text="", icon='DOWNARROW_HLT')
row.operator("clip.track_color_preset_add", text="", icon='ZOOMIN')
props = row.operator("clip.track_color_preset_add",
text="", icon="ZOOMOUT")
text="", icon='ZOOMOUT')
props.remove_active = True
row = layout.row()
@ -349,8 +349,8 @@ class CLIP_PT_tracking_camera(Panel):
row = layout.row(align=True)
label = bpy.types.CLIP_MT_camera_presets.bl_label
row.menu('CLIP_MT_camera_presets', text=label)
row.operator("clip.camera_preset_add", text="", icon="ZOOMIN")
props = row.operator("clip.camera_preset_add", text="", icon="ZOOMOUT")
row.operator("clip.camera_preset_add", text="", icon='ZOOMIN')
props = row.operator("clip.camera_preset_add", text="", icon='ZOOMOUT')
props.remove_active = True
row = layout.row(align=True)
@ -441,11 +441,11 @@ class CLIP_PT_track_settings(Panel):
active = clip.tracking.tracks.active
if active:
layout.prop(active, "tracker")
if active.tracker == "KLT":
layout.prop(active, "pyramid_levels")
if active.tracker == "SAD":
layout.prop(active, "correlation_min")
layout.prop(active, "tracker")
if active.tracker == 'KLT':
layout.prop(active, "pyramid_levels")
elif active.tracker == 'SAD':
layout.prop(active, "correlation_min")
layout.prop(settings, "frames_adjust")
layout.prop(settings, "speed")
@ -489,7 +489,7 @@ class CLIP_PT_stabilization(Panel):
sub.operator("clip.stabilize_2d_remove", icon='ZOOMOUT', text="")
sub.menu('CLIP_MT_stabilize_2d_specials', text="",
icon="DOWNARROW_HLT")
icon='DOWNARROW_HLT')
layout.prop(stab, "influence_location")

14
release/scripts/startup/bl_ui/space_image.py
View File

@ -61,7 +61,7 @@ class IMAGE_MT_view(Menu):
layout.separator()
ratios = [[1, 8], [1, 4], [1, 2], [1, 1], [2, 1], [4, 1], [8, 1]]
ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
for a, b in ratios:
layout.operator("image.view_zoom_ratio", text="Zoom" + " %d:%d" % (a, b)).ratio = a / b
@ -746,12 +746,12 @@ class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
layout.template_curve_mapping(brush, "curve")
row = layout.row(align=True)
row.operator("brush.curve_preset", icon="SMOOTHCURVE", text="").shape = 'SMOOTH'
row.operator("brush.curve_preset", icon="SPHERECURVE", text="").shape = 'ROUND'
row.operator("brush.curve_preset", icon="ROOTCURVE", text="").shape = 'ROOT'
row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
row.operator("brush.curve_preset", icon='SMOOTHCURVE', text="").shape = 'SMOOTH'
row.operator("brush.curve_preset", icon='SPHERECURVE', text="").shape = 'ROUND'
row.operator("brush.curve_preset", icon='ROOTCURVE', text="").shape = 'ROOT'
row.operator("brush.curve_preset", icon='SHARPCURVE', text="").shape = 'SHARP'
row.operator("brush.curve_preset", icon='LINCURVE', text="").shape = 'LINE'
row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX'
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)

8
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -967,10 +967,10 @@ class USERPREF_PT_addons(Panel):
continue
# check if addon should be visible with current filters
if (filter == "All") or \
(filter == info["category"]) or \
(filter == "Enabled" and is_enabled) or \
(filter == "Disabled" and not is_enabled):
if ((filter == "All") or
(filter == info["category"]) or
(filter == "Enabled" and is_enabled) or
(filter == "Disabled" and not is_enabled)):
if search and search not in info["name"].lower():
if info["author"]:

8
release/scripts/startup/bl_ui/space_userpref_keymap.py
View File

@ -223,7 +223,7 @@ class InputKeyMapPanel:
col = layout.column()
row = col.row()
row.label(text=km.name, icon="DOT")
row.label(text=km.name, icon='DOT')
row.label()
row.label()
@ -265,13 +265,13 @@ class InputKeyMapPanel:
if not text:
text = "Blender (default)"
row.menu("USERPREF_MT_keyconfigs", text=text)
row.operator("wm.keyconfig_preset_add", text="", icon="ZOOMIN")
row.operator("wm.keyconfig_preset_add", text="", icon="ZOOMOUT").remove_active = True
row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMIN')
row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMOUT').remove_active = True
#~ layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
#~ row.operator("wm.keyconfig_remove", text="", icon='X')
row.prop(context.space_data, "filter_text", icon="VIEWZOOM")
row.prop(context.space_data, "filter_text", icon='VIEWZOOM')
col.separator()

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -1536,7 +1536,7 @@ class VIEW3D_MT_edit_mesh_select_mode(Menu):
class VIEW3D_MT_edit_mesh_extrude(Menu):
bl_label = "Extrude"
_extrude_funcs = { \
_extrude_funcs = {
"VERT": lambda layout: layout.operator("mesh.extrude_vertices_move", text="Vertices Only"),
"EDGE": lambda layout: layout.operator("mesh.extrude_edges_move", text="Edges Only"),
"FACE": lambda layout: layout.operator("mesh.extrude_faces_move", text="Individual Faces"),

14
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -172,7 +172,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
bl_context = "mesh_edit"
bl_label = "Mesh Options"
@classmethod
def poll(cls, context):
return context.active_object
@ -912,12 +912,12 @@ class VIEW3D_PT_tools_brush_curve(PaintPanel, Panel):
layout.template_curve_mapping(brush, "curve", brush=True)
row = layout.row(align=True)
row.operator("brush.curve_preset", icon="SMOOTHCURVE", text="").shape = 'SMOOTH'
row.operator("brush.curve_preset", icon="SPHERECURVE", text="").shape = 'ROUND'
row.operator("brush.curve_preset", icon="ROOTCURVE", text="").shape = 'ROOT'
row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
row.operator("brush.curve_preset", icon='SMOOTHCURVE', text="").shape = 'SMOOTH'
row.operator("brush.curve_preset", icon='SPHERECURVE', text="").shape = 'ROUND'
row.operator("brush.curve_preset", icon='ROOTCURVE', text="").shape = 'ROOT'
row.operator("brush.curve_preset", icon='SHARPCURVE', text="").shape = 'SHARP'
row.operator("brush.curve_preset", icon='LINCURVE', text="").shape = 'LINE'
row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX'
class VIEW3D_PT_sculpt_options(PaintPanel, Panel):

4
source/blender/blenkernel/CMakeLists.txt
View File

@ -370,7 +370,9 @@ if(WITH_GAMEENGINE)
endif()
if(WITH_LIBMV)
list(APPEND INC ../../../extern/libmv)
list(APPEND INC
../../../extern/libmv
)
add_definitions(-DWITH_LIBMV)
endif()

6
source/blender/blenkernel/intern/movieclip.c
View File

@ -517,7 +517,7 @@ static ImBuf *get_undistorted_cache(MovieClip *clip, MovieClipUser *user)
return cache->undistibuf;
}
static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *distoriton, ImBuf *ibuf)
static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *distortion, ImBuf *ibuf)
{
ImBuf *undistibuf;
@ -525,8 +525,8 @@ static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *dist
otherwise, undistorted proxy can be darker than it should */
imb_freerectfloatImBuf(ibuf);
if(distoriton)
undistibuf= BKE_tracking_distortion_exec(distoriton, &clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f, 1);
if(distortion)
undistibuf= BKE_tracking_distortion_exec(distortion, &clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f, 1);
else
undistibuf= BKE_tracking_undistort(&clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f);

3
source/blender/makesdna/DNA_modifier_types.h
View File

@ -30,7 +30,8 @@
#define MODSTACK_DEBUG 1
/* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE! */
/* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE!
* (ONLY ADD NEW ITEMS AT THE END) */
typedef enum ModifierType {
eModifierType_None = 0,

8
source/blender/makesrna/intern/rna_tracking.c
View File

@ -125,13 +125,6 @@ static void rna_tracking_trackerPyramid_update(Main *UNUSED(bmain), Scene *UNUSE
BKE_tracking_clamp_track(track, CLAMP_PYRAMID_LEVELS);
}
static int rna_tracking_markers_length(PointerRNA *ptr)
{
MovieTrackingTrack *track= (MovieTrackingTrack *)ptr->data;
return track->markersnr;
}
static float rna_trackingCamera_focal_mm_get(PointerRNA *ptr)
{
MovieClip *clip= (MovieClip*)ptr->id.data;
@ -499,7 +492,6 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
prop= RNA_def_property(srna, "markers", PROP_COLLECTION, PROP_NONE);
RNA_def_property_struct_type(prop, "MovieTrackingMarker");
RNA_def_property_collection_sdna(prop, NULL, "markers", "markersnr");
RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, NULL, "rna_tracking_markers_length", NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Markers", "Collection of markers in track");
/* ** channels ** */