archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "Fix crash on Collada exporter"

Browse Source 
This reverts commit bd7060a87f.

I mixed two commits together (a fixup for outliner tooltips and a collada fix).
Re-committing them individually.
This commit is contained in:
Dalai Felinto
2018-01-26 08:40:11 -02:00
parent bd7060a87f
commit 13238ee991
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/EffectExporter.cpp
View File

@@ -67,7 +67,7 @@ EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const ExportSettin
bool EffectsExporter::hasEffects(Scene *sce)
{
FOREACH_SCENE_OBJECT(sce, ob)
FOREACH_SCENE_OBJECT(scene, ob)
{
int a;
for (a = 0; a < ob->totcol; a++) {

25
source/blender/editors/space_outliner/outliner_ops.c
View File

@@ -250,36 +250,21 @@ static int outliner_item_drag_drop_modal(bContext *C, wmOperator *op, const wmEv
return retval;
}
/**
* Check if the given TreeElement is a collection
*
* This test is mainly used to see if next/prev TreeElement is a collection.
* It will fail when there is no next/prev TreeElement, or when the
* element is an Override or something else in the future.
*/
static bool tree_element_is_collection_get(const TreeElement *te) {
if (te == NULL) {
return false;
}
TreeStoreElem *tselem = TREESTORE(te);
return ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION);
}
static const char *outliner_drag_drop_tooltip_get(
const TreeElement *te_float)
{
const char *name = NULL;
TreeStoreElem *tselem = TREESTORE(te_float);
const TreeElement *te_insert = te_float->drag_data->insert_handle;
if (tree_element_is_collection_get(te_float)) {
if (ELEM(tselem->type, TSE_LAYER_COLLECTION, TSE_SCENE_COLLECTION)) {
if (te_insert == NULL) {
name = TIP_("Move collection");
}
else {
switch (te_float->drag_data->insert_type) {
case TE_INSERT_BEFORE:
if (tree_element_is_collection_get(te_insert->prev)) {
if (te_insert->prev) {
name = TIP_("Move between collections");
}
else {
@@ -287,7 +272,7 @@ static const char *outliner_drag_drop_tooltip_get(
}
break;
case TE_INSERT_AFTER:
if (tree_element_is_collection_get(te_insert->next)) {
if (te_insert->next) {
name = TIP_("Move between collections");
}
else {
@@ -300,7 +285,7 @@ static const char *outliner_drag_drop_tooltip_get(
}
}
}
else if ((TREESTORE(te_float)->type == 0) && (te_float->idcode == ID_OB)) {
else if ((tselem->type == 0) && (te_float->idcode == ID_OB)) {
name = TIP_("Move to collection (Ctrl to add)");
}