Revision: 43556
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43556
Author: campbellbarton
Date: 2012-01-20 12:34:00 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43530:43554
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43530
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_color.h
branches/bmesh/blender/source/blender/blenlib/intern/math_color.c
branches/bmesh/blender/source/blender/blenlib/intern/math_color_inline.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/bmesh/blender/source/blender/makesdna/DNA_image_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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-43530
+
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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-43554
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43530
+
/trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2012-01-20 12:32:11 UTC (rev 43555)
+++
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2012-01-20 12:34:00 UTC (rev 43556)
@@ -824,13 +824,14 @@
def REMESH(self, layout, ob, md):
layout.prop(md, "mode")
-
- layout.prop(md, "octree_depth")
- layout.prop(md, "scale")
+
row = layout.row()
- row.active = md.mode == "SHARP"
- row.prop(md, "sharpness")
+ row.prop(md, "octree_depth")
+ row.prop(md, "scale")
+ if md.mode == "SHARP":
+ layout.prop(md, "sharpness")
+
layout.prop(md, "remove_disconnected_pieces")
row = layout.row()
row.active = md.remove_disconnected_pieces
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
2012-01-20 12:32:11 UTC (rev 43555)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
2012-01-20 12:34:00 UTC (rev 43556)
@@ -671,11 +671,11 @@
col.prop(brush, "color", text="")
row = col.row(align=True)
- self.prop_unified_size(row, context, brush, "size", slider=True)
+ self.prop_unified_size(row, context, brush, "size", slider=True,
text="Radius")
self.prop_unified_size(row, context, brush, "use_pressure_size")
row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength",
slider=True)
+ self.prop_unified_strength(row, context, brush, "strength",
slider=True, text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
row = col.row(align=True)
@@ -820,11 +820,11 @@
col = layout.column()
row = col.row(align=True)
- self.prop_unified_size(row, context, brush, "size", slider=True)
+ self.prop_unified_size(row, context, brush, "size", slider=True,
text="Radius")
self.prop_unified_size(row, context, brush, "use_pressure_size")
row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength",
slider=True)
+ self.prop_unified_strength(row, context, brush, "strength",
slider=True, text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
split = layout.split()
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2012-01-20 12:32:11 UTC (rev 43555)
+++
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2012-01-20 12:34:00 UTC (rev 43556)
@@ -526,16 +526,16 @@
if brush.use_space and tool != 'SMOOTH':
if brush.use_space_atten:
- row.prop(brush, "use_space_atten", toggle=True,
text="", icon='LOCKED')
+ row.prop(brush, "use_space_atten", toggle=True,
icon='LOCKED')
else:
- row.prop(brush, "use_space_atten", toggle=True,
text="", icon='UNLOCKED')
+ row.prop(brush, "use_space_atten", toggle=True,
icon='UNLOCKED')
- self.prop_unified_strength(row, context, brush, "strength")
+ self.prop_unified_strength(row, context, brush, "strength",
text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
if tool == 'ROTATE':
row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength")
+ self.prop_unified_strength(row, context, brush, "strength",
text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
if tool != 'SMOOTH':
@@ -627,7 +627,7 @@
self.prop_unified_size(row, context, brush, "use_pressure_size")
row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength")
+ self.prop_unified_strength(row, context, brush, "strength",
text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
row = col.row(align=True)
@@ -653,7 +653,7 @@
self.prop_unified_size(row, context, brush, "use_pressure_size")
row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength")
+ self.prop_unified_strength(row, context, brush, "strength",
text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
row = col.row(align=True)
@@ -671,7 +671,7 @@
self.prop_unified_size(row, context, brush, "use_pressure_size")
row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength")
+ self.prop_unified_strength(row, context, brush, "strength",
text="Strength")
self.prop_unified_strength(row, context, brush,
"use_pressure_strength")
# XXX - TODO
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-01-20 12:32:11 UTC (rev 43555)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-01-20 12:34:00 UTC (rev 43556)
@@ -97,9 +97,16 @@
BLI_memarena_free(a);
}
-static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels, int
useAging, int useArena, int UNUSED(useFlatSubdiv)) {
+typedef enum {
+ CCG_USE_AGING = 1,
+ CCG_USE_ARENA = 2,
+} CCGFlags;
+
+static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels, CCGFlags
flags) {
CCGMeshIFC ifc;
CCGSubSurf *ccgSS;
+ int useAging = !!(flags & CCG_USE_AGING);
+ int useArena = flags & CCG_USE_ARENA;
/* subdivLevels==0 is not allowed */
subdivLevels = MAX2(subdivLevels, 1);
@@ -107,7 +114,6 @@
if (prevSS) {
int oldUseAging;
- useAging = !!useAging;
ccgSubSurf_getUseAgeCounts(prevSS, &oldUseAging, NULL, NULL,
NULL);
if (oldUseAging!=useAging) {
@@ -342,7 +348,7 @@
return;
/* create a CCGSubSurf from uv's */
- uvss = _getSubSurf(NULL, ccgSubSurf_getSubdivisionLevels(ss), 0, 1, 0);
+ uvss = _getSubSurf(NULL, ccgSubSurf_getSubdivisionLevels(ss),
CCG_USE_ARENA);
if(!ss_sync_from_uv(uvss, ss, dm, dmloopuv)) {
ccgSubSurf_free(uvss);
@@ -3245,7 +3251,7 @@
int isFinalCalc, int
forEditMode, int inEditMode)
{
int useSimple = smd->subdivType == ME_SIMPLE_SUBSURF;
- int useAging = smd->flags & eSubsurfModifierFlag_DebugIncr;
+ CCGFlags useAging = smd->flags & eSubsurfModifierFlag_DebugIncr ?
CCG_USE_AGING : 0;
int useSubsurfUv = smd->flags & eSubsurfModifierFlag_SubsurfUv;
int drawInteriorEdges = !(smd->flags &
eSubsurfModifierFlag_ControlEdges);
CCGDerivedMesh *result = NULL;
@@ -3253,8 +3259,7 @@
if(forEditMode) {
int levels= (smd->modifier.scene)?
get_render_subsurf_level(&smd->modifier.scene->r, smd->levels): smd->levels;
- smd->emCache = _getSubSurf(smd->emCache, levels, useAging, 0,
- useSimple);
+ smd->emCache = _getSubSurf(smd->emCache, levels, useAging);
ss_sync_from_derivedmesh(smd->emCache, dm, vertCos, useSimple);
result = getCCGDerivedMesh(smd->emCache,
@@ -3268,7 +3273,7 @@
if(levels == 0)
return dm;
- ss = _getSubSurf(NULL, levels, 0, 1, useSimple);
+ ss = _getSubSurf(NULL, levels, CCG_USE_ARENA);
ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple);
@@ -3278,7 +3283,6 @@
result->freeSS = 1;
} else {
int useIncremental = 1; //(smd->flags &
eSubsurfModifierFlag_Incremental);
- int useAging = smd->flags & eSubsurfModifierFlag_DebugIncr;
int levels= (smd->modifier.scene)?
get_render_subsurf_level(&smd->modifier.scene->r, smd->levels): smd->levels;
CCGSubSurf *ss;
@@ -3299,13 +3303,11 @@
}
if(useIncremental && isFinalCalc) {
- smd->mCache = ss = _getSubSurf(smd->mCache, levels,
-
useAging, 0, useSimple);
+ smd->mCache = ss = _getSubSurf(smd->mCache, levels,
useAging);
if (!ss_sync_from_derivedmesh(ss, dm, vertCos,
useSimple)) {
//ccgSubSurf_free(smd->mCache);
- smd->mCache = ss = _getSubSurf(NULL, levels,
-
useAging, 0, useSimple);
+ smd->mCache = ss = _getSubSurf(NULL, levels,
useAging);
ss_sync_from_derivedmesh(ss, dm, vertCos,
useSimple);
@@ -3320,7 +3322,7 @@
smd->mCache = NULL;
}
- ss = _getSubSurf(NULL, levels, 0, 1, useSimple);
+ ss = _getSubSurf(NULL, levels, CCG_USE_ARENA);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
