Revision: 28638
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28638
Author: campbellbarton
Date: 2010-05-07 08:54:07 +0200 (Fri, 07 May 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender
-r28622:28637
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_image.py
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/space_logic/logic_ops.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_view3d/view3d_buttons.c
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesrna/RNA_enum_types.h
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_sensor.c
branches/render25/source/blender/modifiers/intern/MOD_cloth.c
branches/render25/source/blender/python/generic/blf_api.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/blender/windowmanager/intern/wm_init_exit.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/render25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/render25/source/gameengine/Ketsji/KX_ObjectActuator.cpp
Modified: branches/render25/release/scripts/ui/space_image.py
===================================================================
--- branches/render25/release/scripts/ui/space_image.py 2010-05-07 04:52:10 UTC
(rev 28637)
+++ branches/render25/release/scripts/ui/space_image.py 2010-05-07 06:54:07 UTC
(rev 28638)
@@ -29,7 +29,7 @@
layout = self.layout
sima = context.space_data
- # uv = sima.uv_editor
+ uv = sima.uv_editor
toolsettings = context.tool_settings
show_uvedit = sima.show_uvedit
@@ -42,6 +42,7 @@
layout.prop(sima, "update_automatically")
if show_uvedit:
layout.prop(toolsettings, "uv_local_view") # Numpad /
+ layout.prop(uv, "draw_other_objects")
layout.separator()
Modified: branches/render25/source/blender/blenkernel/intern/colortools.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/colortools.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/blenkernel/intern/colortools.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -939,12 +939,12 @@
{
int x, y, c, n, nl;
double div, divl;
- float *rf;
- unsigned char *rc;
+ float *rf=NULL;
+ unsigned char *rc=NULL;
unsigned int *bin_r, *bin_g, *bin_b, *bin_lum;
int savedlines, saveline;
float rgb[3], ycc[3];
- int ycc_mode;
+ int ycc_mode=-1;
if (scopes->ok == 1 ) return;
Modified: branches/render25/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/object.c 2010-05-07
04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/blenkernel/intern/object.c 2010-05-07
06:54:07 UTC (rev 28638)
@@ -1146,12 +1146,13 @@
}
BLI_duplicatelist(&psysn->targets, &psys->targets);
-
+
psysn->pathcache= NULL;
psysn->childcache= NULL;
psysn->edit= NULL;
psysn->frand= NULL;
psysn->pdd= NULL;
+ psysn->effectors= NULL;
psysn->pathcachebufs.first = psysn->pathcachebufs.last = NULL;
psysn->childcachebufs.first = psysn->childcachebufs.last = NULL;
Modified: branches/render25/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/render25/source/blender/editors/animation/keyframing.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/animation/keyframing.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -1033,9 +1033,13 @@
if (ELEM(NULL, sa, scene))
return 0;
- /* if Outliner, only allow in DataBlocks view */
- if (so && (so->outlinevis != SO_DATABLOCKS))
- return 0;
+ /* if Outliner, don't allow in some views */
+ if (so) {
+ if (ELEM4(so->outlinevis, SO_GROUPS, SO_LIBRARIES,
SO_VERSE_SESSION, SO_VERSE_SESSION))
+ return 0;
+ if (ELEM3(so->outlinevis, SO_SEQUENCE, SO_USERDEF, SO_KEYMAP))
+ return 0;
+ }
/* TODO: checks for other space types can be added here */
Modified: branches/render25/source/blender/editors/interface/interface_draw.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_draw.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/interface/interface_draw.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -969,7 +969,7 @@
void vectorscope_draw_target(float centerx, float centery, float diam, float
r, float g, float b)
{
float y,u,v;
- float tangle, tampli;
+ float tangle=0.f, tampli;
float dangle, dampli, dangle2, dampli2;
rgb_to_yuv(r,g,b, &y, &u, &v);
Modified: branches/render25/source/blender/editors/object/object_constraint.c
===================================================================
--- branches/render25/source/blender/editors/object/object_constraint.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/object/object_constraint.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -496,7 +496,7 @@
char constraint_name[32];
int owner = RNA_enum_get(op->ptr, "owner");
bConstraint *con;
- ListBase *list;
+ ListBase *list=NULL;
RNA_string_get(op->ptr, "constraint", constraint_name);
Modified: branches/render25/source/blender/editors/object/object_ops.c
===================================================================
--- branches/render25/source/blender/editors/object/object_ops.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/object/object_ops.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -317,7 +317,7 @@
WM_keymap_add_item(keymap, "OBJECT_OT_restrictview_clear", HKEY,
KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "OBJECT_OT_restrictview_set", HKEY,
KM_PRESS, 0, 0);
- RNA_boolean_set(WM_keymap_add_item(keymap,
"OBJECT_OT_restrictview_set", HKEY, KM_PRESS, KM_SHIFT, KM_CTRL)->ptr,
"unselected", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap,
"OBJECT_OT_restrictview_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected",
1);
/* same as above but for rendering */
WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_clear", HKEY,
KM_PRESS, KM_ALT|KM_CTRL, 0);
Modified: branches/render25/source/blender/editors/render/render_shading.c
===================================================================
--- branches/render25/source/blender/editors/render/render_shading.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/render/render_shading.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -796,7 +796,7 @@
static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *str,
int imtype)
{
- ImBuf *ibuf;
+ ImBuf *ibuf=NULL;
int dx;
int retval;
Modified: branches/render25/source/blender/editors/space_logic/logic_ops.c
===================================================================
--- branches/render25/source/blender/editors/space_logic/logic_ops.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/space_logic/logic_ops.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -289,7 +289,8 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "type", sensor_type_items, SENS_ALWAYS,
"Type", "Type of sensor to add");
+ prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items, SENS_ALWAYS,
"Type", "Type of sensor to add");
+ RNA_def_enum_funcs(prop, rna_Sensor_type_itemf);
}
/* ************* Add/Remove Controller Operator ************* */
@@ -474,7 +475,8 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- prop= RNA_def_enum(ot->srna, "type", actuator_type_items,
CONT_LOGIC_AND, "Type", "Type of actuator to add");
+ prop= RNA_def_enum(ot->srna, "type", DummyRNA_NULL_items,
CONT_LOGIC_AND, "Type", "Type of actuator to add");
+ RNA_def_enum_funcs(prop, rna_Actuator_type_itemf);
}
void ED_operatortypes_logic(void)
Modified: branches/render25/source/blender/editors/space_logic/logic_window.c
===================================================================
--- branches/render25/source/blender/editors/space_logic/logic_window.c
2010-05-07 04:52:10 UTC (rev 28637)
+++ branches/render25/source/blender/editors/space_logic/logic_window.c
2010-05-07 06:54:07 UTC (rev 28638)
@@ -3213,10 +3213,14 @@
static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
{
- uiItemR(layout, ptr, "armature_type", 0, NULL, 0);
- uiItemR(layout, ptr, "channel_name", 0, NULL, 0);
- uiItemR(layout, ptr, "constraint_name", 0, NULL, 0);
- uiItemR(layout, ptr, "value", 0, NULL, 0);
+ uiLayout *row;
+ row = uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "channel_name", 0, NULL, 0);
+ uiItemR(row, ptr, "constraint_name", 0, NULL, 0);
+
+ row = uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "test_type", 0, NULL, 0);
+ uiItemR(row, ptr, "value", 0, NULL, 0);
}
static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr)
@@ -3688,27 +3692,94 @@
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);
+ split = uiLayoutSplit(layout, 0.15, 0);
+ uiItemR(split, ptr, "persistent", UI_ITEM_R_TOGGLE,
NULL, 0);
+
+ row = uiLayoutRow(split, 1);
+ uiItemR(row, ptr, "time", 0, NULL, 0);
+ uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER,
NULL, 0);
break;
case ACT_CONST_TYPE_ORI:
- uiItemL(layout, "to be done", 0);
+ uiItemR(layout, ptr, "direction_axis", 0, NULL, 0);
+
+ row=uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "damping", UI_ITEM_R_SLIDER , NULL,
0);
+ uiItemR(row, ptr, "time", 0, NULL, 0);
+
+ row=uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "max_rotation", 0, NULL, 0);
+
+ row=uiLayoutRow(layout, 1);
+ uiItemR(row, ptr, "min_angle", 0, NULL, 0);
+ uiItemR(row, ptr, "max_angle", 0, NULL, 0);
break;
case ACT_CONST_TYPE_FH:
- uiItemL(layout, "to be done", 0);
+ split=uiLayoutSplit(layout, 0.75, 0);
+ row= uiLayoutRow(split, 0);
+ uiItemR(row, ptr, "fh_damping", UI_ITEM_R_SLIDER ,
NULL, 0);
+ switch(RNA_enum_get(ptr, "direction_axis")){
+ case ACT_CONST_DIRPX:
+ case ACT_CONST_DIRNX:
+ uiItemR(row, ptr, "fh_height_x", 0,
NULL, 0);
+ uiItemR(split, ptr, "fh_paralel_axis",
UI_ITEM_R_TOGGLE , NULL, 0);
+
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "direction_axis", 0,
NULL, 0);
+ split = uiLayoutSplit(row, 0.9, 0);
+ uiItemR(split, ptr, "spring_x", 0,
NULL, 0);
+ uiItemR(split, ptr, "fh_normal",
UI_ITEM_R_TOGGLE , NULL, 0);
+ break;
+
+ case ACT_CONST_DIRPY:
+ case ACT_CONST_DIRNY:
+ uiItemR(row, ptr, "fh_height_y", 0,
NULL, 0);
+ uiItemR(split, ptr, "fh_paralel_axis",
UI_ITEM_R_TOGGLE , NULL, 0);
+
+ row = uiLayoutRow(layout, 0);
+ uiItemR(row, ptr, "direction_axis", 0,
NULL, 0);
+ split = uiLayoutSplit(row, 0.9, 0);
+ uiItemR(split, ptr, "spring_y", 0,
NULL, 0);
+ uiItemR(split, ptr, "fh_normal",
UI_ITEM_R_TOGGLE , NULL, 0);
+
+ default:
//ACT_CONST_DIRPZ|ACT_CONST_DIRPZ|ACT_CONST_NONE
+ uiItemR(row, ptr, "fh_height_z", 0,
NULL, 0);
+ uiItemR(split, ptr, "fh_paralel_axis",
UI_ITEM_R_TOGGLE , NULL, 0);
+
+ row = uiLayoutRow(layout, 0);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
