Revision: 40857
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40857
Author: psy-fi
Date: 2011-10-08 14:53:13 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Removing all uv island manager related source.
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_image.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
Removed Paths:
-------------
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_island_manager.c
Modified:
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
===================================================================
---
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
2011-10-08 14:29:13 UTC (rev 40856)
+++
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
2011-10-08 14:53:13 UTC (rev 40857)
@@ -259,7 +259,6 @@
layout.separator()
layout.prop(uv, "use_live_unwrap")
- layout.prop(uv, "use_island_manager")
layout.operator("uv.unwrap")
layout.operator("uv.pin", text="Unpin").clear = True
layout.operator("uv.pin")
Modified:
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_image.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_image.h
2011-10-08 14:29:13 UTC (rev 40856)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_image.h
2011-10-08 14:53:13 UTC (rev 40857)
@@ -65,8 +65,6 @@
int ED_space_image_show_paint(struct SpaceImage *sima);
int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit);
int ED_space_image_show_uvshadow(struct SpaceImage *sima, struct Object
*obedit);
-/* enable uvedit_island_manager */
-void ED_space_image_enable_island_manager(int state);
/* UI level image (texture) updating... render calls own stuff (too) */
void ED_image_update_frame(const struct Main *mainp, int cfra);
Modified:
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
2011-10-08 14:29:13 UTC (rev 40856)
+++
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
2011-10-08 14:53:13 UTC (rev 40857)
@@ -307,13 +307,6 @@
return 0;
}
-/* enable island manager */
-void ED_space_image_enable_island_manager(int state)
-{
- /* in uvedit_island_manager */
- UVIslandManager *manager = ED_get_island_manager_handle();
- manager->active = (state > 0);
-}
static void image_scopes_tag_refresh(ScrArea *sa)
{
Modified:
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/CMakeLists.txt
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/CMakeLists.txt
2011-10-08 14:29:13 UTC (rev 40856)
+++
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/CMakeLists.txt
2011-10-08 14:53:13 UTC (rev 40857)
@@ -41,7 +41,6 @@
uvedit_ops.c
uvedit_parametrizer.c
uvedit_unwrap_ops.c
- uvedit_island_manager.c
uvedit_intern.h
uvedit_parametrizer.h
)
Deleted:
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_island_manager.c
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_island_manager.c
2011-10-08 14:29:13 UTC (rev 40856)
+++
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_island_manager.c
2011-10-08 14:53:13 UTC (rev 40857)
@@ -1,63 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- *
- * Contributor(s): Antony Riakiotakis, Blender Foundation, 2002-2009
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/editors/uvedit/uvedit_island_manager.cpp
- * \ingroup eduv
- */
-
-#include "GL/glew.h"
-#include "DNA_scene_types.h"
-
-#include "ED_image.h"
-#include "ED_uvedit.h"
-
-
-
-static UVIslandManager _island_manager;
-
-/* get enable state of island manager */
-int ED_uvedit_island_manager_get_enabled(void)
-{
- /* in uvedit_island_manager */
- return _island_manager.active;
-}
-
-UVIslandManager *ED_get_island_manager_handle(void)
-{
- return (&_island_manager);
-}
-
-void ED_uvedit_island_manager_draw(void)
-{
-
-}
-
-static void draw_UV_island_cell(UVIslandComponent *cell)
-{
-
-}
Modified:
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
2011-10-08 14:29:13 UTC (rev 40856)
+++ branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
2011-10-08 14:53:13 UTC (rev 40857)
@@ -779,7 +779,6 @@
#define SI_DRAW_OTHER (1<<23)
#define SI_COLOR_CORRECTION (1<<24)
-#define SI_ISLAND_MANAGER (1<<25)
/* SpaceIpo->flag (Graph Editor Settings) */
/* OLD DEPRECEATED SETTING */
Modified:
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
2011-10-08 14:29:13 UTC (rev 40856)
+++ branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
2011-10-08 14:53:13 UTC (rev 40857)
@@ -448,12 +448,6 @@
ED_space_image_paint_update(bmain->wm.first, scene->toolsettings);
}
-static void rna_update_island_manager(Main *UNUSED(bmain), Scene
*UNUSED(scene), PointerRNA *ptr)
-{
- SpaceImage *sima= (SpaceImage*)(ptr->data);
- ED_space_image_enable_island_manager(sima->flag & SI_ISLAND_MANAGER);
-}
-
static int rna_SpaceImageEditor_show_render_get(PointerRNA *ptr)
{
SpaceImage *sima= (SpaceImage*)(ptr->data);
@@ -1060,11 +1054,6 @@
"Continuously unwrap the selected UV island
while transforming pinned vertices");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
- prop= RNA_def_property(srna, "use_island_manager", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_ISLAND_MANAGER);
- RNA_def_property_ui_text(prop, "UV Island Manager", "Define Areas for
uv islands to reside in");
- RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE,
"rna_update_island_manager");
-
prop= RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "around");
RNA_def_property_enum_items(prop, pivot_items);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
