Revision: 27845
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27845
Author: yukishiro
Date: 2010-03-30 00:43:49 +0200 (Tue, 30 Mar 2010)
Log Message:
-----------
merge up till 23220.next is crlf..
Modified Paths:
--------------
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.h
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/smoke_API.cpp
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_object.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_node.py
branches/soc-2009-yukishiro/release/ui/space_view3d.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_screen.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/screen.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-yukishiro/source/blender/editors/animation/anim_deps.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_add.c
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/node_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/nan_compile.mk
branches/soc-2009-yukishiro/source/nan_warn.mk
Modified: branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.cpp
2010-03-29 22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.cpp
2010-03-29 22:43:49 UTC (rev 27845)
@@ -182,6 +182,9 @@
//////////////////////////////////////////////////////////////////////
void FLUID_3D::step()
{
+ // addSmokeTestCase(_density, _res);
+ // addSmokeTestCase(_heat, _res);
+
// wipe forces
for (int i = 0; i < _totalCells; i++)
{
Modified: branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.h
===================================================================
--- branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.h 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.h 2010-03-29
22:43:49 UTC (rev 27845)
@@ -47,7 +47,7 @@
void initVectorNoise(int amplify);
void addSmokeColumn();
- static void addSmokeTestCase(float* field, Vec3Int res, float
value);
+ static void addSmokeTestCase(float* field, Vec3Int res);
void step();
void addObstacle(OBSTACLE* obstacle);
Modified: branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_STATIC.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_STATIC.cpp
2010-03-29 22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_STATIC.cpp
2010-03-29 22:43:49 UTC (rev 27845)
@@ -44,8 +44,8 @@
// generic static version, so that it can be applied to the
// WTURBULENCE grid as well
//////////////////////////////////////////////////////////////////////
-/*
-void FLUID_3D::addSmokeTestCase(float* field, Vec3Int res, float value)
+
+void FLUID_3D::addSmokeTestCase(float* field, Vec3Int res)
{
const int slabSize = res[0]*res[1]; int maxRes = (int)MAX3V(res);
float dx = 1.0f / (float)maxRes;
@@ -57,23 +57,23 @@
float heighMin = 0.05;
float heighMax = 0.10;
- for (int y = 0; y < res[1]; y++)
- for (int z = (int)(heighMin*res[2]); z <= (int)(heighMax * res[1]); z++)
+ for (int y = 0; y < res[2]; y++)
+ for (int z = (int)(heighMin*res[2]); z <= (int)(heighMax * res[2]); z++)
for (int x = 0; x < res[0]; x++)
{
float xLength = x * dx - xTotal * 0.4f;
- float yLength = y * dx - zTotal * 0.5f;
+ float yLength = y * dx - yTotal * 0.5f;
float radius = sqrtf(xLength * xLength + yLength * yLength);
if (radius < 0.075f * xTotal)
{
int index = x + y * res[0] + z * slabSize;
- field[index] = value;
+ field[index] = 1.0f;
}
}
}
-*/
+
//////////////////////////////////////////////////////////////////////
// set x direction to Neumann boundary conditions
//////////////////////////////////////////////////////////////////////
@@ -295,12 +295,10 @@
const int xres = res[0];
const int yres = res[1];
const int zres = res[2];
- static int hits = 0;
- static int total = 0;
const int slabSize = res[0] * res[1];
// scale dt up to grid resolution
-#if PARALLEL==1 && !_WIN32
+#if PARALLEL==1
#pragma omp parallel
#pragma omp for schedule(static)
#endif
Modified: branches/soc-2009-yukishiro/intern/smoke/intern/smoke_API.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/smoke/intern/smoke_API.cpp
2010-03-29 22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/intern/smoke/intern/smoke_API.cpp
2010-03-29 22:43:49 UTC (rev 27845)
@@ -81,8 +81,7 @@
extern "C" void smoke_turbulence_step(WTURBULENCE *wt, FLUID_3D *fluid)
{
- if(wt)
- wt->stepTurbulenceFull(fluid->_dt/fluid->_dx,
fluid->_xVelocity, fluid->_yVelocity, fluid->_zVelocity, fluid->_obstacles);
+ wt->stepTurbulenceFull(fluid->_dt/fluid->_dx, fluid->_xVelocity,
fluid->_yVelocity, fluid->_zVelocity, fluid->_obstacles);
}
extern "C" void smoke_initBlenderRNA(FLUID_3D *fluid, float *alpha, float
*beta)
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2010-03-29
22:43:49 UTC (rev 27845)
@@ -75,7 +75,7 @@
col.itemR(lamp, "diffuse")
class DATA_PT_sunsky(DataButtonsPanel):
- __label__ = "Sun/Sky"
+ __label__ = "Sky & Atmosphere"
def poll(self, context):
lamp = context.lamp
@@ -86,10 +86,9 @@
lamp = context.lamp.sky
- row = layout.row()
- row.itemR(lamp, "sky")
- row.itemR(lamp, "atmosphere")
+ layout.itemR(lamp, "sky")
+
row = layout.row()
row.active = lamp.sky or lamp.atmosphere
row.itemR(lamp, "atmosphere_turbidity", text="Turbidity")
@@ -98,38 +97,39 @@
col = split.column()
col.active = lamp.sky
- col.itemL(text="Blend Mode:")
- sub = col.column(align=True)
+ col.itemL(text="Blending:")
+ sub = col.column()
sub.itemR(lamp, "sky_blend_type", text="")
sub.itemR(lamp, "sky_blend", text="Factor")
col.itemL(text="Color Space:")
- sub = col.column(align=True)
- sub.itemR(lamp, "sky_color_space", text="")
+ sub = col.column()
+ sub.row().itemR(lamp, "sky_color_space", expand=True)
sub.itemR(lamp, "sky_exposure", text="Exposure")
col = split.column()
col.active = lamp.sky
col.itemL(text="Horizon:")
- sub = col.column(align=True)
+ sub = col.column()
sub.itemR(lamp, "horizon_brightness", text="Brightness")
sub.itemR(lamp, "spread", text="Spread")
col.itemL(text="Sun:")
- sub = col.column(align=True)
+ sub = col.column()
sub.itemR(lamp, "sun_brightness", text="Brightness")
sub.itemR(lamp, "sun_size", text="Size")
sub.itemR(lamp, "backscattered_light", slider=True,text="Back
Light")
layout.itemS()
+ layout.itemR(lamp, "atmosphere")
+
split = layout.split()
col = split.column()
col.active = lamp.atmosphere
- col.itemL(text="Sun:")
- col.itemR(lamp, "sun_intensity", text="Intensity")
- col.itemL(text="Scale Distance:")
+ col.itemL(text="Intensity:")
+ col.itemR(lamp, "sun_intensity", text="Sun")
col.itemR(lamp, "atmosphere_distance_factor", text="Distance")
col = split.column()
Modified: branches/soc-2009-yukishiro/release/ui/buttons_object.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_object.py 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/buttons_object.py 2010-03-29
22:43:49 UTC (rev 27845)
@@ -92,10 +92,14 @@
layout = self.layout
ob = context.object
-
- row = layout.row()
- row.itemR(ob, "max_draw_type", text="Type")
- row.itemR(ob, "draw_bounds_type", text="Bounds")
+
+ split = layout.split()
+ col = split.column()
+ col.itemR(ob, "max_draw_type", text="Type")
+ col = split.column()
+ row = col.row()
+ row.itemR(ob, "draw_bounds", text="Bounds")
+ row.itemR(ob, "draw_bounds_type", text="")
flow = layout.column_flow()
flow.itemR(ob, "draw_name", text="Name")
Modified: branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
2010-03-29 22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
2010-03-29 22:43:49 UTC (rev 27845)
@@ -184,18 +184,16 @@
#row.itemR(md, "render", text="")
#row.itemR(md, "realtime", text="")
- coll = md.settings
+ settings = md.settings
else:
# add modifier
split.item_enumO("object.modifier_add", "type",
'COLLISION', text="Add")
split.itemL()
- coll = None
+ settings = None
- if coll:
- settings = context.object.collision
-
+ if settings:
layout.active = settings.enabled
split = layout.split()
Modified: branches/soc-2009-yukishiro/release/ui/buttons_texture.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_texture.py 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/buttons_texture.py 2010-03-29
22:43:49 UTC (rev 27845)
@@ -381,7 +381,10 @@
tex = context.texture
layout.itemR(tex, "progression")
- layout.itemR(tex, "flip_axis")
+ sub = layout.row()
+
+ sub.active = (tex.progression in ('LINEAR', 'QUADRATIC',
'EASING', 'RADIAL'))
+ sub.itemR(tex, "flip_axis", expand=True)
class TEXTURE_PT_stucci(TextureTypePanel):
__label__ = "Stucci"
Modified: branches/soc-2009-yukishiro/release/ui/space_info.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_info.py 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/space_info.py 2010-03-29
22:43:49 UTC (rev 27845)
@@ -61,7 +61,8 @@
layout.itemS()
layout.operator_context = "INVOKE_AREA"
- layout.itemO("wm.link_append", text="Append or Link")
+ layout.itemO("wm.link_append", text="Link")
+ layout.item_booleanO("wm.link_append", "link", False,
text="Append")
layout.itemS()
layout.itemM("INFO_MT_file_import")
Modified: branches/soc-2009-yukishiro/release/ui/space_node.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_node.py 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/space_node.py 2010-03-29
22:43:49 UTC (rev 27845)
@@ -74,11 +74,10 @@
layout.itemO("node.select_border")
- # XXX
- # layout.itemS()
- # layout.itemO("node.select_all")
- # layout.itemO("node.select_linked_from")
- # layout.itemO("node.select_linked_to")
+ layout.itemS()
+ layout.itemO("node.select_all")
+ layout.itemO("node.select_linked_from")
+ layout.itemO("node.select_linked_to")
class NODE_MT_node(bpy.types.Menu):
__space_type__ = 'NODE_EDITOR'
Modified: branches/soc-2009-yukishiro/release/ui/space_view3d.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_view3d.py 2010-03-29
22:29:57 UTC (rev 27844)
+++ branches/soc-2009-yukishiro/release/ui/space_view3d.py 2010-03-29
22:43:49 UTC (rev 27845)
@@ -34,6 +34,8 @@
if mode_string not in ['PAINT_WEIGHT',
'PAINT_TEXTURE']:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
