Revision: 43617
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43617
Author: campbellbarton
Date: 2012-01-22 20:15:05 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43611:43616
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43611
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43611
+
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43616
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-01-22 20:05:26 UTC (rev 43616)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-01-22 20:15:05 UTC (rev 43617)
@@ -1698,9 +1698,6 @@
}
/* vertex group paint */
else if (surface->type ==
MOD_DPAINT_SURFACE_T_WEIGHT) {
- MLoop *mloop =
CDDM_get_loops(result);
- int totloop =
result->numLoopData;
-
int defgrp_index =
defgroup_name_index(ob, surface->output_name);
MDeformVert *dvert =
result->getVertDataArray(result, CD_MDEFORMVERT);
float *weight =
(float*)sData->type_data;
Modified:
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
2012-01-22 20:05:26 UTC (rev 43616)
+++ branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
2012-01-22 20:15:05 UTC (rev 43617)
@@ -66,6 +66,14 @@
#define EM_SEPR_X 6
#define EM_SEPR_Y 6
+#define UI_OPERATOR_ERROR_RET(_ot, _opname, return_statement) \
+ if (ot == NULL) {
\
+ ui_item_disabled(layout, _opname);
\
+ RNA_warning("'%s' unknown operator", _opname);
\
+ return_statement;
\
+ } (void)0
\
+
+
/* uiLayoutRoot */
typedef struct uiLayoutRoot {
@@ -690,14 +698,9 @@
{
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error
next */
- if(ot) {
- return uiItemFullO_ptr(layout, ot, name, icon, properties,
context, flag);
- }
- else {
- ui_item_disabled(layout, opname);
- RNA_warning("unknown operator '%s'", opname);
- return PointerRNA_NULL;
- }
+ UI_OPERATOR_ERROR_RET(ot, opname, return PointerRNA_NULL);
+
+ return uiItemFullO_ptr(layout, ot, name, icon, properties, context,
flag);
}
static const char *ui_menu_enumpropname(uiLayout *layout, PointerRNA *ptr,
PropertyRNA *prop, int retval)
@@ -842,13 +845,6 @@
uiItemsFullEnumO(layout, opname, propname, NULL,
layout->root->opcontext, 0);
}
-#define UI_OPERATOR_ERROR_RET(_ot, _opname) \
- if (ot == NULL) {
\
- ui_item_disabled(layout, _opname);
\
- RNA_warning("'%s' unknown operator", _opname);
\
- return;
\
- } (void)0
-
/* for use in cases where we have */
void uiItemEnumO_value(uiLayout *layout, const char *name, int icon, const
char *opname, const char *propname, int value)
{
@@ -856,7 +852,7 @@
PointerRNA ptr;
PropertyRNA *prop;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
@@ -887,7 +883,7 @@
EnumPropertyItem *item;
int value, free;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
@@ -925,7 +921,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error
next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_boolean_set(&ptr, propname, value);
@@ -938,7 +934,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error
next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_int_set(&ptr, propname, value);
@@ -951,7 +947,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error
next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_float_set(&ptr, propname, value);
@@ -964,7 +960,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error
next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_string_set(&ptr, propname, value);
@@ -1608,7 +1604,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error
next */
MenuItemLevel *lvl;
- UI_OPERATOR_ERROR_RET(ot, opname);
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
if(!ot->srna) {
ui_item_disabled(layout, opname);
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530,43565-43611
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530,43565-43616
Modified:
branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
---
branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
2012-01-22 20:05:26 UTC (rev 43616)
+++
branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
2012-01-22 20:15:05 UTC (rev 43617)
@@ -139,9 +139,9 @@
RNA_string_set(drop->ptr, "dragged_obj", id->name+2);
/* Set to simple parent clear type. Avoid menus for drag and drop if
possible.
- If desired, user can toggle the different "Clear Parent" types in the
operator
- menu on tool shelf. */
- RNA_string_set(drop->ptr, "type", 0);
+ * If desired, user can toggle the different "Clear Parent" types in
the operator
+ * menu on tool shelf. */
+ RNA_enum_set(drop->ptr, "type", 0);
}
/* region dropbox definition */
Modified:
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
2012-01-22 20:05:26 UTC (rev 43616)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
2012-01-22 20:15:05 UTC (rev 43617)
@@ -294,7 +294,8 @@
static int stitch_check_uvs_state_stitchable(UvElement *element, UvElement
*element_iter, StitchState *state){
- if(state->snap_islands && element->island == element_iter->island)
+ if((state->snap_islands && element->island == element_iter->island) ||
+ (!state->midpoints && element->island ==
element_iter->island))
return 0;
return stitch_check_uvs_stitchable(element, element_iter, state);
@@ -547,9 +548,8 @@
if(element_iter->separate){
if(element_iter == element)
continue;
- if(stitch_check_uvs_stitchable(element, element_iter,
state)){
- if(((element_iter->island ==
state->static_island) || (element->island == state->static_island)) &&
- !((element_iter->island ==
element->island) && state->snap_islands)){
+ if(stitch_check_uvs_state_stitchable(element,
element_iter, state)){
+ if((element_iter->island ==
state->static_island) || (element->island == state->static_island)){
element->flag |= STITCH_STITCHABLE;
preview->num_stitchable++;
stitch_setup_face_preview_for_uv_group(element, state, island_stitch_data);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
