[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27743] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27721 :27742
Brecht Van Lommel
brecht at blender.org
Thu Mar 25 14:23:08 CET 2010
Revision: 27743
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27743
Author: blendix
Date: 2010-03-25 14:23:08 +0100 (Thu, 25 Mar 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27721:27742
Modified Paths:
--------------
branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/render25/release/scripts/ui/properties_physics_fluid.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/BKE_object.h
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/fluidsim.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/nla.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenlib/BLI_math_vector.h
branches/render25/source/blender/blenlib/intern/math_vector.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/animation/anim_intern.h
branches/render25/source/blender/editors/animation/anim_ops.c
branches/render25/source/blender/editors/animation/keyframes_edit.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/curve/editcurve.c
branches/render25/source/blender/editors/include/ED_fluidsim.h
branches/render25/source/blender/editors/include/ED_keyframing.h
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/physics/physics_fluid.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/makesdna/DNA_object_fluidsim.h
branches/render25/source/blender/makesrna/intern/rna_animation.c
branches/render25/source/blender/makesrna/intern/rna_animation_api.c
branches/render25/source/blender/makesrna/intern/rna_fluidsim.c
branches/render25/source/blender/makesrna/intern/rna_nodetree.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_object_force.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/render25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/render25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
Modified: branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-03-25 13:23:08 UTC (rev 27743)
@@ -644,6 +644,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\uvproject.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\voxel.c"
>
</File>
@@ -797,6 +801,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_uvproject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\BLI_voxel.h"
>
</File>
Modified: branches/render25/release/scripts/ui/properties_physics_fluid.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_fluid.py 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/release/scripts/ui/properties_physics_fluid.py 2010-03-25 13:23:08 UTC (rev 27743)
@@ -42,7 +42,7 @@
md = context.fluid
wide_ui = context.region.width > narrowui
- split = layout.split()
+ split = layout.split(percentage=0.5)
split.operator_context = 'EXEC_DEFAULT'
if md:
@@ -53,7 +53,7 @@
row = split.row(align=True)
row.prop(md, "render", text="")
row.prop(md, "realtime", text="")
-
+
fluid = md.settings
else:
@@ -67,10 +67,19 @@
if fluid:
if wide_ui:
- layout.prop(fluid, "type")
+ row = layout.row()
+ row.prop(fluid, "type")
+ if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'):
+ row.prop(fluid, "active", text="")
else:
layout.prop(fluid, "type", text="")
-
+ if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'):
+ layout.prop(fluid, "active", text="")
+
+ layout = layout.column()
+ if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'):
+ layout.active = fluid.active
+
if fluid.type == 'DOMAIN':
layout.operator("fluid.bake", text="Bake Fluid Simulation", icon='MOD_FLUIDSIM')
split = layout.split()
@@ -220,15 +229,29 @@
layout = self.layout
fluid = context.fluid.settings
+ scene = context.scene
wide_ui = context.region.width > narrowui
split = layout.split()
col = split.column()
- col.label(text="Gravity:")
- col.prop(fluid, "gravity", text="")
- col.label(text="Real World Size:")
- col.prop(fluid, "real_world_size", text="Metres")
+ if scene.use_gravity:
+ col.label(text="Using Scene Gravity", icon="SCENE_DATA")
+ sub = col.column()
+ sub.enabled = False
+ sub.prop(fluid, "gravity", text="")
+ else:
+ col.label(text="Gravity:")
+ col.prop(fluid, "gravity", text="")
+
+ if scene.unit_settings.system != 'NONE':
+ col.label(text="Using Scene Size Units", icon="SCENE_DATA")
+ sub = col.column()
+ sub.enabled = False
+ sub.prop(fluid, "real_world_size", text="Metres")
+ else:
+ col.label(text="Real World Size:")
+ col.prop(fluid, "real_world_size", text="Metres")
if wide_ui:
col = split.column()
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-03-25 13:23:08 UTC (rev 27743)
@@ -654,6 +654,7 @@
layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
+ layout.operator("anim.keying_set_active_set", text="Change Keying Set...")
layout.separator()
@@ -1020,6 +1021,7 @@
layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
+ layout.operator("anim.keying_set_active_set", text="Change Keying Set...")
layout.separator()
Modified: branches/render25/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_object.h 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenkernel/BKE_object.h 2010-03-25 13:23:08 UTC (rev 27743)
@@ -112,6 +112,8 @@
struct BoundBox *unit_boundbox(void);
void boundbox_set_from_min_max(struct BoundBox *bb, float min[3], float max[3]);
struct BoundBox *object_get_boundbox(struct Object *ob);
+void object_get_dimensions(struct Object *ob, float *value);
+void object_set_dimensions(struct Object *ob, const float *value);
void object_boundbox_flag(struct Object *ob, int flag, int set);
void minmax_object(struct Object *ob, float *min, float *max);
int minmax_object_duplis(struct Scene *scene, struct Object *ob, float *min, float *max);
Modified: branches/render25/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/action.c 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenkernel/intern/action.c 2010-03-25 13:23:08 UTC (rev 27743)
@@ -372,7 +372,7 @@
return NULL;
if(pose->chanhash)
- return BLI_ghash_lookup(pose->chanhash, name);
+ return BLI_ghash_lookup(pose->chanhash, (char*)name);
return BLI_findstring(&((bPose *)pose)->chanbase, name, offsetof(bPoseChannel, name));
}
Modified: branches/render25/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/fluidsim.c 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenkernel/intern/fluidsim.c 2010-03-25 13:23:08 UTC (rev 27743)
@@ -148,7 +148,7 @@
fss->lastgoodframe = -1;
- fss->flag = 0;
+ fss->flag |= OB_FLUIDSIM_ACTIVE;
}
#endif
Modified: branches/render25/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-25 13:23:08 UTC (rev 27743)
@@ -4834,11 +4834,7 @@
DerivedMesh *dm = NULL;
CastModifierData *cmd = (CastModifierData *)md;
- if (ob->type == OB_MESH) {
- /* DerivedMesh is used only in case object is MESH */
- /* so we could optimize modifier applying by skipping DM creation */
- dm = get_dm(md->scene, ob, NULL, derivedData, NULL, 0);
- }
+ dm = get_dm(md->scene, ob, NULL, derivedData, NULL, 0);
if (cmd->type == MOD_CAST_TYPE_CUBOID) {
castModifier_cuboid_do(cmd, ob, dm, vertexCos, numVerts);
Modified: branches/render25/source/blender/blenkernel/intern/nla.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/nla.c 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenkernel/intern/nla.c 2010-03-25 13:23:08 UTC (rev 27743)
@@ -44,6 +44,7 @@
#include "BKE_fcurve.h"
#include "BKE_nla.h"
#include "BKE_library.h"
+#include "BKE_utildefines.h"
#include "RNA_access.h"
#include "nla_private.h"
Modified: branches/render25/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/object.c 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenkernel/intern/object.c 2010-03-25 13:23:08 UTC (rev 27743)
@@ -2317,6 +2317,44 @@
}
}
+void object_get_dimensions(Object *ob, float *value)
+{
+ BoundBox *bb = NULL;
+
+ bb= object_get_boundbox(ob);
+ if (bb) {
+ float scale[3];
+
+ mat4_to_size( scale,ob->obmat);
+
+ value[0] = fabs(scale[0]) * (bb->vec[4][0] - bb->vec[0][0]);
+ value[1] = fabs(scale[1]) * (bb->vec[2][1] - bb->vec[0][1]);
+ value[2] = fabs(scale[2]) * (bb->vec[1][2] - bb->vec[0][2]);
+ } else {
+ value[0] = value[1] = value[2] = 0.f;
+ }
+}
+
+void object_set_dimensions(Object *ob, const float *value)
+{
+ BoundBox *bb = NULL;
+
+ bb= object_get_boundbox(ob);
+ if (bb) {
+ float scale[3], len[3];
+
+ mat4_to_size( scale,ob->obmat);
+
+ len[0] = bb->vec[4][0] - bb->vec[0][0];
+ len[1] = bb->vec[2][1] - bb->vec[0][1];
+ len[2] = bb->vec[1][2] - bb->vec[0][2];
+
+ if (len[0] > 0.f) ob->size[0] = value[0] / len[0];
+ if (len[1] > 0.f) ob->size[1] = value[1] / len[1];
+ if (len[2] > 0.f) ob->size[2] = value[2] / len[2];
+ }
+}
+
void minmax_object(Object *ob, float *min, float *max)
{
BoundBox bb;
Modified: branches/render25/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- branches/render25/source/blender/blenlib/BLI_math_vector.h 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenlib/BLI_math_vector.h 2010-03-25 13:23:08 UTC (rev 27743)
@@ -111,6 +111,7 @@
void interp_v3_v3v3(float r[3], const float a[3], const float b[3], const float t);
void interp_v3_v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float w[3]);
void interp_v3_v3v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float v4[3], const float w[4]);
+void interp_v4_v4v4(float r[4], const float a[4], const float b[4], const float t);
void mid_v3_v3v3(float r[3], float a[3], float b[3]);
Modified: branches/render25/source/blender/blenlib/intern/math_vector.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/math_vector.c 2010-03-25 12:35:53 UTC (rev 27742)
+++ branches/render25/source/blender/blenlib/intern/math_vector.c 2010-03-25 13:23:08 UTC (rev 27743)
@@ -55,6 +55,16 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list