Revision: 26440
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26440
Author: kjym3
Date: 2010-01-30 18:44:57 +0100 (Sat, 30 Jan 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 26439.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26439
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/app.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/util/editmode_undo.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dynlibtiff.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/gen_dynlibtiff.py
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/python/generic/euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
Modified: branches/soc-2008-mxcurioni/release/scripts/modules/bpy/app.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/bpy/app.py
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/bpy/app.py
2010-01-30 17:44:57 UTC (rev 26440)
@@ -45,9 +45,8 @@
"""
# constants
import _bpy
-import sys as _sys
version = _bpy._VERSION
version_string = _bpy._VERSION_STR
home = _bpy._HOME
binary_path = _bpy._BINPATH
-debug = ("-d" in _sys.argv)
+debug = _bpy._DEBUG
Modified: branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
2010-01-30 17:44:57 UTC (rev 26440)
@@ -72,7 +72,7 @@
test_reload(_sys.modules[module_name])
for base_path in script_paths():
- for path_subdir in ("ui", "op", "io", "cfg"):
+ for path_subdir in ("", "ui", "op", "io", "cfg"):
path = _os.path.join(base_path, path_subdir)
if _os.path.isdir(path):
@@ -87,7 +87,7 @@
if f.endswith(".py"):
# python module
mod = test_import(f[0:-3])
- elif "." not in f:
+ elif ("." not in f) and
(_os.path.isdir(_os.path.join(path, f, "__init__.py"))):
# python package
mod = test_import(f)
else:
Modified:
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
2010-01-30 17:44:57 UTC (rev 26440)
@@ -37,10 +37,9 @@
ob = context.object
wide_ui = context.region.width > narrowui
compact_mod = context.region.width < narrowmod
+
+ layout.operator_menu_enum("object.modifier_add", "type")
- row = layout.row()
- row.operator_menu_enum("object.modifier_add", "type")
-
for md in ob.modifiers:
box = layout.template_modifier(md, compact=compact_mod)
if box:
Modified:
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
===================================================================
---
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
2010-01-30 17:17:23 UTC (rev 26439)
+++
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
2010-01-30 17:44:57 UTC (rev 26440)
@@ -730,13 +730,10 @@
def draw(self, context):
layout = self.layout
+
ob = context.object
- wide_ui = context.region.width > narrowui
- row = layout.row()
- row.operator_menu_enum("object.constraint_add", "type")
- if wide_ui:
- row.label()
+ layout.operator_menu_enum("object.constraint_add", "type")
for con in ob.constraints:
self.draw_constraint(context, con)
@@ -755,12 +752,8 @@
ob = context.object
pchan = ob.pose.bones[context.bone.name]
- wide_ui = context.region.width > narrowui
- row = layout.row()
- row.operator_menu_enum("pose.constraint_add", "type")
- if wide_ui:
- row.label()
+ layout.operator_menu_enum("pose.constraint_add", "type")
for con in pchan.constraints:
self.draw_constraint(context, con)
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
2010-01-30 17:44:57 UTC (rev 26440)
@@ -236,7 +236,14 @@
col.prop(view, "auto_perspective")
col.prop(view, "smooth_view")
col.prop(view, "rotation_angle")
-
+
+ col.separator()
+ col.separator()
+
+ col.label(text="2D Viewports:")
+ col.prop(view, "view2d_grid_minimum_spacing", text="Minimum Grid
Spacing")
+ col.prop(view, "timecode_style")
+
row.separator()
row.separator()
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
2010-01-30 17:44:57 UTC (rev 26440)
@@ -1740,16 +1740,22 @@
col.prop(gs, "material_mode", text="")
col.prop(view, "textured_solid")
-# XXX - the Quad View options don't work yet
-# layout.separator()
-#
-# layout.operator("screen.region_foursplit", text="Toggle Quad
View")
-# col = layout.column()
-# col.prop(view, "lock_rotation")
-# col.prop(view, "box_preview")
-# col.prop(view, "box_clip")
+ layout.separator()
+ region = view.region_quadview
+ layout.operator("screen.region_quadview", text="Toggle Quad View")
+
+ if region:
+ col = layout.column()
+ col.prop(region, "lock_rotation")
+ row = col.row()
+ row.enabled = region.lock_rotation
+ row.prop(region, "box_preview")
+ row = col.row()
+ row.enabled = region.lock_rotation and region.box_preview
+ row.prop(region, "box_clip")
+
class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
2010-01-30 17:44:57 UTC (rev 26440)
@@ -94,8 +94,16 @@
/* Fix all the paths for the entire database... */
void BKE_all_animdata_fix_paths_rename(char *prefix, char *oldName, char
*newName);
-void BKE_animdata_main_cb(struct Main *main, void (*func)(struct ID *, struct
AnimData *, void *), void *user_data);
+/* ************************************* */
+/* Batch AnimData API */
+/* Define for callback looper used in BKE_animdata_main_cb */
+typedef void (*ID_AnimData_Edit_Callback)(struct ID *id, struct AnimData *adt,
void *user_data);
+
+
+/* Loop over all datablocks applying callback */
+void BKE_animdata_main_cb(struct Main *main, ID_AnimData_Edit_Callback func,
void *user_data);
+
/* ************************************* */
// TODO: overrides, remapping, and path-finding api's
Modified:
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
2010-01-30 17:44:57 UTC (rev 26440)
@@ -467,12 +467,10 @@
int levelBase = lvl + (1<<lvl) - 1;
return &EDGE_getLevelData(e)[dataSize*(levelBase + x)];
}
-#if 0
static float *_edge_getNo(CCGEdge *e, int lvl, int x, int dataSize, int
normalDataOffset) {
int levelBase = lvl + (1<<lvl) - 1;
return (float*) &EDGE_getLevelData(e)[dataSize*(levelBase + x) +
normalDataOffset];
}
-#endif
static void *_edge_getCoVert(CCGEdge *e, CCGVert *v, int lvl, int x, int
dataSize) {
int levelBase = lvl + (1<<lvl) - 1;
if (v==e->v0) {
@@ -535,6 +533,12 @@
byte *gridBase = FACE_getCenterData(f) + dataSize*(1 + S*(maxGridSize +
maxGridSize*maxGridSize));
return &gridBase[dataSize*x*spacing];
}
+static CCG_INLINE void *_face_getIENo(CCGFace *f, int lvl, int S, int x, int
levels, int dataSize, int normalDataOffset) {
+ int maxGridSize = 1 + (1<<(levels-1));
+ int spacing = 1<<(levels-lvl);
+ byte *gridBase = FACE_getCenterData(f) + dataSize*(1 + S*(maxGridSize +
maxGridSize*maxGridSize));
+ return &gridBase[dataSize*x*spacing + normalDataOffset];
+}
static CCG_INLINE void *_face_getIFCo(CCGFace *f, int lvl, int S, int x, int
y, int levels, int dataSize) {
int maxGridSize = 1 + (1<<(levels-1));
int spacing = 1<<(levels-lvl);
@@ -1139,8 +1143,11 @@
return eCCGError_None;
}
+#define VERT_getNo(e, lvl) _vert_getNo(e,
lvl, vertDataSize, normalDataOffset)
+#define EDGE_getNo(e, lvl, x) _edge_getNo(e, lvl, x,
vertDataSize, normalDataOffset)
#define FACE_getIFNo(f, lvl, S, x, y) _face_getIFNo(f, lvl, S, x, y,
subdivLevels, vertDataSize, normalDataOffset)
#define FACE_calcIFNo(f, lvl, S, x, y, no) _face_calcIFNo(f, lvl, S, x, y,
no, subdivLevels, vertDataSize)
+#define FACE_getIENo(f, lvl, S, x) _face_getIENo(f, lvl,
S, x, subdivLevels, vertDataSize, normalDataOffset)
static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss,
CCGVert **effectedV, CCGEdge **effectedE, CCGFace **effectedF,
int numEffectedV, int numEffectedE, int numEffectedF) {
@@ -1304,8 +1311,28 @@
}
}
}
+
+ VertDataCopy((float*)((byte*)FACE_getCenterData(f) +
normalDataOffset),
+ FACE_getIFNo(f, lvl, S, 0, 0));
+
+ for (x=1; x<gridSize-1; x++)
+ NormCopy(FACE_getIENo(f, lvl, S, x),
+ FACE_getIFNo(f, lvl, S, x, 0));
}
}
+
+ for (ptrIdx=0; ptrIdx<numEffectedE; ptrIdx++) {
+ CCGEdge *e = (CCGEdge*) effectedE[ptrIdx];
+
+ if (e->numFaces) {
+ CCGFace *f = e->faces[0];
+ int x;
+
+ for (x=0; x<edgeSize; x++)
+ NormCopy(EDGE_getNo(e, lvl, x),
+ _face_getIFNoEdge(f, e, lvl, x, 0,
subdivLevels, vertDataSize, normalDataOffset));
+ }
+ }
}
#undef FACE_getIFNo
Modified:
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
2010-01-30 17:17:23 UTC (rev 26439)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
2010-01-30 17:44:57 UTC (rev 26440)
@@ -1769,7 +1769,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
