[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28623] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28613 :28622
Campbell Barton
ideasman42 at gmail.com
Thu May 6 19:58:13 CEST 2010
Revision: 28623
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28623
Author: campbellbarton
Date: 2010-05-06 19:58:13 +0200 (Thu, 06 May 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28613:28622
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_object.py
branches/render25/release/scripts/ui/properties_physics_common.py
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/makesdna/DNA_actuator_types.h
branches/render25/source/blender/makesdna/DNA_object_force.h
branches/render25/source/blender/makesrna/intern/rna_action.c
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_object_force.c
branches/render25/source/blender/windowmanager/intern/wm_window.c
Modified: branches/render25/release/scripts/ui/properties_object.py
===================================================================
--- branches/render25/release/scripts/ui/properties_object.py 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/release/scripts/ui/properties_object.py 2010-05-06 17:58:13 UTC (rev 28623)
@@ -154,7 +154,7 @@
wide_ui = context.region.width > narrowui
split = layout.split(percentage=0.8, align=True)
- split.operator("object.group_link", text="Link to Group")
+ split.operator("object.group_link", text="Add to Group")
split.operator("object.group_add", text="", icon='ZOOMIN')
# XXX, this is bad practice, yes, I wrote it :( - campbell
Modified: branches/render25/release/scripts/ui/properties_physics_common.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_common.py 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/release/scripts/ui/properties_physics_common.py 2010-05-06 17:58:13 UTC (rev 28623)
@@ -73,6 +73,8 @@
sub.prop(cache, "disk_cache")
col.label(text=cache.info)
+ sub = col.column()
+ sub.prop(cache, "use_library_path", "Use Lib Path")
layout.separator()
Modified: branches/render25/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/pointcache.c 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/source/blender/blenkernel/intern/pointcache.c 2010-05-06 17:58:13 UTC (rev 28623)
@@ -1086,7 +1086,7 @@
char file[MAX_PTCACHE_PATH]; /* we dont want the dir, only the file */
char *blendfilename;
- blendfilename= (lib)? lib->filename: G.sce;
+ blendfilename= (lib && (pid->cache->flag & PTCACHE_IGNORE_LIBPATH)==0) ? lib->filename: G.sce;
BLI_split_dirfile(blendfilename, NULL, file);
i = strlen(file);
Modified: branches/render25/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/render25/source/blender/editors/space_image/image_ops.c 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/source/blender/editors/space_image/image_ops.c 2010-05-06 17:58:13 UTC (rev 28623)
@@ -964,7 +964,12 @@
if(ibuf->name[0]==0)
BLI_strncpy(ibuf->name, G.ima, FILE_MAX);
-
+
+ /* enable save_copy by default for render results */
+ if(ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE) && !RNA_property_is_set(op->ptr, "copy")) {
+ RNA_boolean_set(op->ptr, "copy", TRUE);
+ }
+
// XXX note: we can give default menu enums to operator for this
image_filesel(C, op, ibuf->name);
Modified: branches/render25/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/render25/source/blender/editors/space_image/space_image.c 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/source/blender/editors/space_image/space_image.c 2010-05-06 17:58:13 UTC (rev 28623)
@@ -537,7 +537,7 @@
static int image_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
{
if(drag->type==WM_DRAG_PATH)
- if(ELEM(drag->icon, ICON_FILE_IMAGE, ICON_FILE_BLANK)) /* rule might not work? */
+ if(ELEM3(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_BLANK)) /* rule might not work? */
return 1;
return 0;
}
Modified: branches/render25/source/blender/editors/space_logic/logic_window.c
===================================================================
--- branches/render25/source/blender/editors/space_logic/logic_window.c 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/source/blender/editors/space_logic/logic_window.c 2010-05-06 17:58:13 UTC (rev 28623)
@@ -3544,7 +3544,32 @@
static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
{
- //XXXACTUATOR
+ uiLayout *row;
+
+ row= uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "mode", 0, NULL, 0);
+ uiItemR(row, ptr, "action", 0, NULL, 0);
+ uiItemR(row, ptr, "continue_last_frame", 0, NULL, 0);
+
+ row= uiLayoutRow(layout, 0);
+ if((RNA_enum_get(ptr, "mode") == ACT_ACTION_FROM_PROP))
+ uiItemR(row, ptr, "property", 0, NULL, 0);
+
+ else {
+ uiItemR(row, ptr, "frame_start", 0, NULL, 0);
+ uiItemR(row, ptr, "frame_end", 0, NULL, 0);
+ }
+
+ row= uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "blendin", 0, NULL, 0);
+ uiItemR(row, ptr, "priority", 0, NULL, 0);
+
+ row= uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "frame_property", 0, NULL, 0);
+
+#ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
+ uiItemR(row, "stride_length", 0, NULL, 0);
+#endif
}
static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
@@ -3599,6 +3624,90 @@
static void draw_actuator_constraint(uiLayout *layout, PointerRNA *ptr)
{
+ uiLayout *row, *subrow, *split;
+
+ uiItemR(layout, ptr, "mode", 0, NULL, 0);
+ switch (RNA_enum_get(ptr, "mode"))
+ {
+ case ACT_CONST_TYPE_LOC:
+ uiItemR(layout, ptr, "limit", 0, NULL, 0);
+
+ switch(RNA_enum_get(ptr, "limit")){
+ case ACT_CONST_LOCX:
+ row = uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "limit_loc_min_x", 0, NULL, 0);
+ uiItemR(row, ptr, "limit_loc_max_x", 0, NULL, 0);
+ break;
+
+ case ACT_CONST_LOCY:
+ row = uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "limit_loc_min_y", 0, NULL, 0);
+ uiItemR(row, ptr, "limit_loc_max_y", 0, NULL, 0);
+ break;
+
+ case ACT_CONST_LOCZ:
+ row = uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "limit_loc_min_z", 0, NULL, 0);
+ uiItemR(row, ptr, "limit_loc_max_z", 0, NULL, 0);
+ break;
+ }
+ uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, 0);
+ break;
+
+ case ACT_CONST_TYPE_DIST:
+ uiItemR(layout, ptr, "direction", 0, NULL, 0);//move to the right
+ if(RNA_enum_get(ptr, "direction")!=0)
+ uiItemR(layout, ptr, "force_distance", 0, NULL, 0);
+
+ switch(RNA_enum_get(ptr, "direction")){
+ case ACT_CONST_DIRPX:
+ case ACT_CONST_DIRNX:
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "range_x", 0, NULL, 0);
+ subrow = uiLayoutRow(row, 0);
+ uiLayoutSetActive(subrow, RNA_boolean_get(ptr, "force_distance")==1);
+ uiItemR(subrow, ptr, "distance_x", 0, NULL, 0);
+ break;
+
+ case ACT_CONST_DIRPY:
+ case ACT_CONST_DIRNY:
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "range_y", 0, NULL, 0);
+ subrow = uiLayoutRow(row, 0);
+ uiLayoutSetActive(subrow, RNA_boolean_get(ptr, "force_distance")==1);
+ uiItemR(subrow, ptr, "distance_y", 0, NULL, 0);
+ break;
+
+ case ACT_CONST_DIRPZ:
+ case ACT_CONST_DIRNZ:
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "range_z", 0, NULL, 0);
+ subrow = uiLayoutRow(row, 0);
+ uiLayoutSetActive(subrow, RNA_boolean_get(ptr, "force_distance")==1);
+ uiItemR(subrow, ptr, "distance_z", 0, NULL, 0);
+ break;
+ }
+ uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER , NULL, 0);
+ split = uiLayoutSplit(layout, 0.15, 0);
+ uiItemR(split, ptr, "detect_material", UI_ITEM_R_TOGGLE, NULL, 0);
+
+ if (RNA_boolean_get(ptr, "detect_material"))
+ uiItemR(split, ptr, "material", 0, NULL, 0);
+ else
+ uiItemR(split, ptr, "property", 0, NULL, 0);
+
+ uiItemR(layout, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, 0);
+ break;
+
+ case ACT_CONST_TYPE_ORI:
+ uiItemL(layout, "to be done", 0);
+ break;
+
+ case ACT_CONST_TYPE_FH:
+ uiItemL(layout, "to be done", 0);
+ break;
+ }
+
//XXXACTUATOR STILL HAVE TO DO THE RNA
}
@@ -3951,9 +4060,41 @@
#endif
}
-static void draw_actuator_sound(uiLayout *layout, PointerRNA *ptr)
+static void draw_actuator_sound(uiLayout *layout, PointerRNA *ptr, bContext *C)
{
- //XXXACTUATOR
+ uiLayout *row, *box;
+
+ uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL);
+ if (!RNA_pointer_get(ptr, "sound").data)
+ {
+ uiItemL(layout, "Select a sound from the list or load a new one", 0);
+ return;
+ }
+ uiItemR(layout, ptr, "mode", 0, NULL, 0);
+
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "volume", 0, NULL, 0);
+ uiItemR(row, ptr, "pitch", 0, NULL, 0);
+
+ uiItemR(layout, ptr, "enable_sound_3d", UI_ITEM_R_TOGGLE, NULL, 0);
+ box = uiLayoutBox(layout);
+ uiLayoutSetActive(box, RNA_boolean_get(ptr, "enable_sound_3d")==1);
+
+ row = uiLayoutRow(box, 0);
+ uiItemR(row, ptr, "minimum_gain_3d", 0, NULL, 0);
+ uiItemR(row, ptr, "maximum_gain_3d", 0, NULL, 0);
+
+ row = uiLayoutRow(box, 0);
+ uiItemR(row, ptr, "reference_distance_3d", 0, NULL, 0);
+ uiItemR(row, ptr, "max_distance_3d", 0, NULL, 0);
+
+ row = uiLayoutRow(box, 0);
+ uiItemR(row, ptr, "rolloff_factor_3d", 0, NULL, 0);
+ uiItemR(row, ptr, "cone_outer_gain_3d", 0, NULL, 0);
+
+ row = uiLayoutRow(box, 0);
+ uiItemR(row, ptr, "cone_outer_angle_3d", 0, NULL, 0);
+ uiItemR(row, ptr, "cone_inner_angle_3d", 0, NULL, 0);
}
static void draw_actuator_state(uiLayout *layout, PointerRNA *ptr)
@@ -3971,7 +4112,7 @@
uiItemR(row, ptr, "children", 0, NULL, 0);
}
-void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr)
+void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
{
uiLayout *box;
@@ -4027,7 +4168,7 @@
draw_actuator_shape_action(box, ptr);
break;
case ACT_SOUND:
- draw_actuator_sound(box, ptr);
+ draw_actuator_sound(box, ptr, C);
break;
case ACT_STATE:
draw_actuator_state(box, ptr);
@@ -4287,7 +4428,7 @@
draw_actuator_header(col, &ptr);
/* draw the brick contents */
- draw_brick_actuator(col, &ptr);
+ draw_brick_actuator(col, &ptr, C);
}
}
Modified: branches/render25/source/blender/makesdna/DNA_actuator_types.h
===================================================================
--- branches/render25/source/blender/makesdna/DNA_actuator_types.h 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/source/blender/makesdna/DNA_actuator_types.h 2010-05-06 17:58:13 UTC (rev 28623)
@@ -351,6 +351,7 @@
#define ACT_PROP_TOGGLE 3
/* constraint flag */
+#define ACT_CONST_NONE 0
#define ACT_CONST_LOCX 1
#define ACT_CONST_LOCY 2
#define ACT_CONST_LOCZ 4
Modified: branches/render25/source/blender/makesdna/DNA_object_force.h
===================================================================
--- branches/render25/source/blender/makesdna/DNA_object_force.h 2010-05-06 17:45:02 UTC (rev 28622)
+++ branches/render25/source/blender/makesdna/DNA_object_force.h 2010-05-06 17:58:13 UTC (rev 28623)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list