Revision: 39588
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39588
Author: psy-fi
Date: 2011-08-21 18:48:02 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
sculpt uvs
==============
-major rename of paint uvs->sculpt uvs and all associated constants, data
structures, elfs, dwarfs and gnomes
-rename pin edges to lock borders
Thanks to Daniel Salazar for the suggestions
Modified Paths:
--------------
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-onion/source/blender/blenkernel/intern/paint.c
branches/soc-2011-onion/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/blenloader/intern/writefile.c
branches/soc-2011-onion/source/blender/editors/include/ED_image.h
branches/soc-2011-onion/source/blender/editors/object/object_edit.c
branches/soc-2011-onion/source/blender/editors/screen/screen_ops.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-onion/source/blender/editors/space_image/image_ops.c
branches/soc-2011-onion/source/blender/editors/space_image/space_image.c
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-onion/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt_uv.c
Removed Paths:
-------------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_uv.c
Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py
2011-08-21 18:48:02 UTC (rev 39588)
@@ -291,7 +291,7 @@
layout.menu("IMAGE_MT_uvs_showhide")
layout.separator()
- layout.prop(toolsettings, "use_uv_paint")
+ layout.prop(toolsettings, "use_uv_sculpt")
layout.separator()
@@ -767,14 +767,14 @@
class IMAGE_UV_paint_curve(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'
bl_region_type = 'UI'
- bl_label = "UV Paint Curve"
+ bl_label = "UV Sculpt Curve"
bl_options = {'DEFAULT_CLOSED'}
@classmethod
def poll(cls, context):
sima = context.space_data
toolsettings = context.tool_settings.image_paint
- return sima.show_uvedit and context.tool_settings.use_uv_paint and not
(sima.show_paint and toolsettings.brush)
+ return sima.show_uvedit and context.tool_settings.use_uv_sculpt and
not (sima.show_paint and toolsettings.brush)
def draw(self, context):
layout = self.layout
@@ -796,18 +796,18 @@
class IMAGE_UV_paint(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'
bl_region_type = 'UI'
- bl_label = "UV Paint"
+ bl_label = "UV Sculpt"
@classmethod
def poll(cls, context):
sima = context.space_data
toolsettings = context.tool_settings.image_paint
- return sima.show_uvedit and context.tool_settings.use_uv_paint and not
(sima.show_paint and toolsettings.brush)
+ return sima.show_uvedit and context.tool_settings.use_uv_sculpt and
not (sima.show_paint and toolsettings.brush)
def draw(self, context):
layout = self.layout
- toolsettings = context.tool_settings.uv_paint
+ toolsettings = context.tool_settings.uv_sculpt
brush = toolsettings.brush
if brush:
@@ -824,15 +824,15 @@
split = layout.split()
col = split.column()
- col.prop(context.tool_settings, "uv_paint_pin_edges");
- col.prop(context.tool_settings, "uv_paint_all_islands");
+ col.prop(context.tool_settings, "uv_sculpt_lock_borders");
+ col.prop(context.tool_settings, "uv_sculpt_all_islands");
split = layout.split()
col = split.column()
- col.prop(context.tool_settings, "uv_paint_tool");
+ col.prop(context.tool_settings, "uv_sculpt_tool");
- if context.tool_settings.uv_paint_tool == 'RELAX':
+ if context.tool_settings.uv_sculpt_tool == 'RELAX':
col.prop(context.tool_settings, "uv_relax_method");
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/paint.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/paint.c
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/paint.c
2011-08-21 18:48:02 UTC (rev 39588)
@@ -72,8 +72,8 @@
case OB_MODE_TEXTURE_PAINT:
return &ts->imapaint.paint;
case OB_MODE_EDIT:
- if(ts->use_uv_paint)
- return &ts->uvpaint->paint;
+ if(ts->use_uv_sculpt)
+ return &ts->uvsculpt->paint;
else
return &ts->imapaint.paint;
}
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/scene.c
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/scene.c
2011-08-21 18:48:02 UTC (rev 39588)
@@ -304,9 +304,9 @@
free_paint(&sce->toolsettings->sculpt->paint);
MEM_freeN(sce->toolsettings->sculpt);
}
- if(sce->toolsettings->uvpaint) {
- free_paint(&sce->toolsettings->uvpaint->paint);
- MEM_freeN(sce->toolsettings->uvpaint);
+ if(sce->toolsettings->uvsculpt) {
+ free_paint(&sce->toolsettings->uvsculpt->paint);
+ MEM_freeN(sce->toolsettings->uvsculpt);
}
free_paint(&sce->toolsettings->imapaint.paint);
Modified: branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
2011-08-21 18:48:02 UTC (rev 39588)
@@ -4464,7 +4464,7 @@
link_paint(fd, sce, &ts->vpaint->paint);
link_paint(fd, sce, &ts->wpaint->paint);
link_paint(fd, sce,
&ts->imapaint.paint);
- link_paint(fd, sce,
&ts->uvpaint->paint);
+ link_paint(fd, sce,
&ts->uvsculpt->paint);
if(ts->paint_overlay.img) {
ts->paint_overlay.img=
@@ -4596,7 +4596,7 @@
direct_link_paint(fd, (Paint**)&sce->toolsettings->sculpt);
direct_link_paint(fd, (Paint**)&sce->toolsettings->vpaint);
direct_link_paint(fd, (Paint**)&sce->toolsettings->wpaint);
- direct_link_paint(fd, (Paint**)&sce->toolsettings->uvpaint);
+ direct_link_paint(fd, (Paint**)&sce->toolsettings->uvsculpt);
if (sce->toolsettings->sculpt)
sce->toolsettings->sculpt->paint.cache= NULL;
@@ -4607,8 +4607,8 @@
if (sce->toolsettings->wpaint)
sce->toolsettings->wpaint->paint.cache= NULL;
- if (sce->toolsettings->uvpaint)
- sce->toolsettings->uvpaint->paint.cache= NULL;
+ if (sce->toolsettings->uvsculpt)
+ sce->toolsettings->uvsculpt->paint.cache= NULL;
sce->toolsettings->imapaint.paint.cache= NULL;
Modified: branches/soc-2011-onion/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenloader/intern/writefile.c
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/blenloader/intern/writefile.c
2011-08-21 18:48:02 UTC (rev 39588)
@@ -1924,8 +1924,8 @@
if(tos->sculpt) {
writestruct(wd, DATA, "Sculpt", 1, tos->sculpt);
}
- if(tos->uvpaint) {
- writestruct(wd, DATA, "UvSmooth", 1, tos->uvpaint);
+ if(tos->uvsculpt) {
+ writestruct(wd, DATA, "UvSculpt", 1, tos->uvsculpt);
}
// write_paint(wd, &tos->imapaint.paint);
Modified: branches/soc-2011-onion/source/blender/editors/include/ED_image.h
===================================================================
--- branches/soc-2011-onion/source/blender/editors/include/ED_image.h
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/editors/include/ED_image.h
2011-08-21 18:48:02 UTC (rev 39588)
@@ -55,7 +55,7 @@
void ED_space_image_uv_aspect(struct SpaceImage *sima, float *aspx, float
*aspy);
void ED_space_image_paint_update(struct wmWindowManager *wm, struct
ToolSettings *settings);
-void ED_space_image_uv_paint_update(struct wmWindowManager *wm, struct
ToolSettings *settings);
+void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct
ToolSettings *settings);
void ED_image_size(struct Image *ima, int *width, int *height);
void ED_image_aspect(struct Image *ima, float *aspx, float *aspy);
Modified: branches/soc-2011-onion/source/blender/editors/object/object_edit.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/object/object_edit.c
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/editors/object/object_edit.c
2011-08-21 18:48:02 UTC (rev 39588)
@@ -522,7 +522,7 @@
else
ED_object_exit_editmode(C,
EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls
undo too [#24685] */
- ED_space_image_uv_paint_update(CTX_wm_manager(C), toolsettings);
+ ED_space_image_uv_sculpt_update(CTX_wm_manager(C), toolsettings);
return OPERATOR_FINISHED;
}
Modified: branches/soc-2011-onion/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/screen/screen_ops.c
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/editors/screen/screen_ops.c
2011-08-21 18:48:02 UTC (rev 39588)
@@ -369,7 +369,7 @@
SpaceImage *sima= CTX_wm_space_image(C);
ToolSettings *toolsettings = CTX_data_scene(C)->toolsettings;
Object *obedit= CTX_data_edit_object(C);
- return ED_space_image_show_uvedit(sima, obedit) &&
!(toolsettings->use_uv_paint);
+ return ED_space_image_show_uvedit(sima, obedit) &&
!(toolsettings->use_uv_sculpt);
}
Modified:
branches/soc-2011-onion/source/blender/editors/sculpt_paint/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/CMakeLists.txt
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/CMakeLists.txt
2011-08-21 18:48:02 UTC (rev 39588)
@@ -55,10 +55,10 @@
paint_hide.c
paint_meshcache.c
paint_texcache.c
- paint_uv.c
paint_brushlib.cpp
paint_overlay.c
+ sculpt_uv.c
sculpt.c
sculpt_tools.c
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
2011-08-21 17:08:05 UTC (rev 39587)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
2011-08-21 18:48:02 UTC (rev 39588)
@@ -4,7 +4,6 @@
sources = []
sources.append('paint_image.c')
-sources.append('paint_uv.c')
sources.append('paint_ops.c')
sources.append('paint_stroke.c')
sources.append('paint_undo.c')
@@ -20,6 +19,7 @@
sources.append('paint_brushlib.cpp')
sources.append('paint_overlay.c')
+sources.append('sculpt_uv.c')
sources.append('sculpt.c')
sources.append('sculpt_tools.c')
@@ -33,7 +33,7 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
incs += ' ../../render/extern/include'
-incs += ' ../../gpu ../../makesrna ../../blenloader'
+incs += ' ../../gpu ../../makesrna ../../blenloader ../uvedit'
incs += ' #/extern/brushlib'
incs += ' #/extern/ptex'
Modified:
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
