Revision: 42011
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42011
Author: campbellbarton
Date: 2011-11-20 16:05:51 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41998:42009
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41998
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/BKE_modifier.h
branches/bmesh/blender/source/blender/blenkernel/BKE_ocean.h
branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/physics/dynamicpaint_ops.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/render/render_opengl.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_fluidsim.h
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene_api.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
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
- /trunk/blender:39992-41998
+ /trunk/blender:39992-42009
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41998
+ /trunk/blender/release:31524-42009
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
2011-11-20 15:58:50 UTC (rev 42010)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
2011-11-20 16:05:51 UTC (rev 42011)
@@ -259,15 +259,11 @@
con = x
if not con:
- return
+ self.report({'ERROR'},
+ "Motion Tracking constraint to be converted not found")
- if con.type == 'FOLLOW_TRACK' and con.use_3d_position:
- mat = ob.matrix_world.copy()
- ob.constraints.remove(con)
- ob.matrix_world = mat
+ return {'CANCELLED'}
- return
-
# Get clip used for parenting
if con.use_active_clip:
clip = scene.active_clip
@@ -275,8 +271,18 @@
clip = con.clip
if not clip:
- return
+ self.report({'ERROR'},
+ "Movie clip to use tracking data from isn't set")
+ return {'CANCELLED'}
+
+ if con.type == 'FOLLOW_TRACK' and con.use_3d_position:
+ mat = ob.matrix_world.copy()
+ ob.constraints.remove(con)
+ ob.matrix_world = mat
+
+ return {'FINISHED'}
+
# Find start and end frames
for track in clip.tracking.tracks:
if sfra is None:
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-11-20 15:58:50 UTC (rev 42010)
+++
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-11-20 16:05:51 UTC (rev 42011)
@@ -458,12 +458,19 @@
layout.separator()
layout.prop(md, "use_normals")
-
- row = layout.row()
- row.prop(md, "use_foam")
- sub = row.row()
+
+ split = layout.split()
+
+ col = split.column()
+ col.prop(md, "use_foam")
+ sub = col.row()
sub.active = md.use_foam
sub.prop(md, "foam_coverage", text="Coverage")
+
+ col = split.column()
+ col.active = md.use_foam
+ col.label("Foam Data Layer Name:")
+ col.prop(md, "foam_layer_name", text="")
layout.separator()
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
2011-11-20 15:58:50 UTC (rev 42010)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
2011-11-20 16:05:51 UTC (rev 42011)
@@ -52,7 +52,7 @@
int BKE_alphatest_ibuf(struct ImBuf *ibuf);
int BKE_write_ibuf_stamp(struct Scene *scene, struct Object
*camera, struct ImBuf *ibuf, const char *name, int imtype, int subimtype, int
quality);
int BKE_write_ibuf(struct ImBuf *ibuf, const char *name, int
imtype, int subimtype, int quality);
-void BKE_makepicstring(char *string, const char *base, int frame, int
imtype, const short use_ext, const short use_frames);
+void BKE_makepicstring(char *string, const char *base, const char *relbase,
int frame, int imtype, const short use_ext, const short use_frames);
int BKE_add_image_extension(char *string, int imtype);
int BKE_ftype_to_imtype(int ftype);
int BKE_imtype_to_ftype(int imtype);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_modifier.h
2011-11-20 15:58:50 UTC (rev 42010)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_modifier.h
2011-11-20 16:05:51 UTC (rev 42011)
@@ -365,5 +365,8 @@
/* here for do_versions */
void modifier_mdef_compact_influences(struct ModifierData *md);
+void modifier_path_init(char *path, int path_maxlen, const char *name);
+const char *modifier_path_relbase(struct Object *ob);
+
#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_ocean.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_ocean.h
2011-11-20 15:58:50 UTC (rev 42010)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_ocean.h
2011-11-20 16:05:51 UTC (rev 42011)
@@ -48,7 +48,8 @@
struct ImBuf **ibufs_foam;
struct ImBuf **ibufs_norm;
- char *bakepath;
+ const char *bakepath;
+ const char *relbase;
/* precalculated for time range */
float *time;
@@ -92,8 +93,9 @@
/* ocean cache handling */
-struct OceanCache *BKE_init_ocean_cache(char *bakepath, int start, int end,
float wave_scale,
- float chop_amount, float
foam_coverage, float foam_fade, int resolution);
+struct OceanCache *BKE_init_ocean_cache(const char *bakepath, const char
*relbase,
+ int start, int end, float wave_scale,
+ float chop_amount, float
foam_coverage, float foam_fade, int resolution);
void BKE_simulate_ocean_cache(struct OceanCache *och, int frame);
void BKE_bake_ocean(struct Ocean *o, struct OceanCache *och, void
(*update_cb)(void *, float progress, int *cancel), void *update_cb_data);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
2011-11-20 15:58:50 UTC (rev 42010)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
2011-11-20 16:05:51 UTC (rev 42011)
@@ -456,7 +456,7 @@
unsigned int i;
for (i= 0; i < 4; i++) {
- float nd= -dist_to_plane_v3(co, data->frame_tx[i],
data->normal_tx[i]);
+ float nd= dist_to_plane_v3(co, data->frame_tx[i],
data->normal_tx[i]);
if (nd < data->dist_vals[i]) {
data->dist_vals[i]= nd;
}
@@ -530,55 +530,49 @@
mul_v3_v3fl(plane_tx[i], data_cb.normal_tx[i],
data_cb.dist_vals[i]);
}
- if ( (isect_plane_plane_v3(plane_isect_1, plane_isect_1_no,
- plane_tx[0], data_cb.normal_tx[0],
- plane_tx[2], data_cb.normal_tx[2])
== 0) ||
- (isect_plane_plane_v3(plane_isect_2, plane_isect_2_no,
- plane_tx[1], data_cb.normal_tx[1],
- plane_tx[3], data_cb.normal_tx[3])
== 0))
+ isect_plane_plane_v3(plane_isect_1, plane_isect_1_no,
+ plane_tx[0], data_cb.normal_tx[0],
+ plane_tx[2], data_cb.normal_tx[2]);
+ isect_plane_plane_v3(plane_isect_2, plane_isect_2_no,
+ plane_tx[1], data_cb.normal_tx[1],
+ plane_tx[3], data_cb.normal_tx[3]);
+
+ add_v3_v3v3(plane_isect_1_other, plane_isect_1,
plane_isect_1_no);
+ add_v3_v3v3(plane_isect_2_other, plane_isect_2,
plane_isect_2_no);
+
+ if (isect_line_line_v3(plane_isect_1, plane_isect_1_other,
+ plane_isect_2, plane_isect_2_other,
+ plane_isect_pt_1, plane_isect_pt_2) == 0)
{
- /* this is very unlikely */
return FALSE;
}
else {
+ float cam_plane_no[3]= {0.0f, 0.0f, -1.0f};
+ float plane_isect_delta[3];
+ float plane_isect_delta_len;
- add_v3_v3v3(plane_isect_1_other, plane_isect_1,
plane_isect_1_no);
- add_v3_v3v3(plane_isect_2_other, plane_isect_2,
plane_isect_2_no);
+ mul_m3_v3(rot_obmat, cam_plane_no);
- if (isect_line_line_v3(plane_isect_1,
plane_isect_1_other,
- plane_isect_2,
plane_isect_2_other,
- plane_isect_pt_1,
plane_isect_pt_2) == 0)
- {
- return FALSE;
+ sub_v3_v3v3(plane_isect_delta, plane_isect_pt_2,
plane_isect_pt_1);
+ plane_isect_delta_len= len_v3(plane_isect_delta);
+
+ if (dot_v3v3(plane_isect_delta, cam_plane_no) > 0.0f) {
+ copy_v3_v3(r_co, plane_isect_pt_1);
+
+ /* offset shift */
+ normalize_v3(plane_isect_1_no);
+ madd_v3_v3fl(r_co, plane_isect_1_no, shift[1] *
-plane_isect_delta_len);
}
else {
- float cam_plane_no[3]= {0.0f, 0.0f, -1.0f};
- float plane_isect_delta[3];
- float plane_isect_delta_len;
+ copy_v3_v3(r_co, plane_isect_pt_2);
- mul_m3_v3(rot_obmat, cam_plane_no);
+ /* offset shift */
+ normalize_v3(plane_isect_2_no);
+ madd_v3_v3fl(r_co, plane_isect_2_no, shift[0] *
-plane_isect_delta_len);
+ }
- sub_v3_v3v3(plane_isect_delta,
plane_isect_pt_2, plane_isect_pt_1);
- plane_isect_delta_len=
len_v3(plane_isect_delta);
- if (dot_v3v3(plane_isect_delta, cam_plane_no) >
0.0f) {
- copy_v3_v3(r_co, plane_isect_pt_1);
-
- /* offset shift */
- normalize_v3(plane_isect_1_no);
- madd_v3_v3fl(r_co, plane_isect_1_no,
shift[1] * -plane_isect_delta_len);
- }
- else {
- copy_v3_v3(r_co, plane_isect_pt_2);
-
- /* offset shift */
- normalize_v3(plane_isect_2_no);
- madd_v3_v3fl(r_co, plane_isect_2_no,
shift[0] * -plane_isect_delta_len);
- }
-
-
- return TRUE;
- }
+ return TRUE;
}
}
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-20 15:58:50 UTC (rev 42010)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-20 16:05:51 UTC (rev 42011)
@@ -976,8 +976,8 @@
surface->wave_timescale = 1.0f;
surface->wave_spring = 0.20f;
- BLI_snprintf(surface->image_output_path,
sizeof(surface->image_output_path), "%sdynamicpaint", U.textudir);
- BLI_cleanup_dir(NULL, surface->image_output_path);
+ modifier_path_init(surface->image_output_path,
sizeof(surface->image_output_path), "dynamicpaint");
+
dynamicPaintSurface_setUniqueName(surface, "Surface");
surface->effector_weights = BKE_add_effector_weights(NULL);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
