Revision: 21085
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21085
Author: yukishiro
Date: 2009-06-22 23:52:22 +0200 (Mon, 22 Jun 2009)
Log Message:
-----------
change spaces to tabs. add two files that are skipped by merge
Modified Paths:
--------------
branches/soc-2009-yukishiro/source/blender/SConscript
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_global.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/brush.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/customdata.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lightenv.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/util/ed_util.c
branches/soc-2009-yukishiro/source/blender/editors/util/undo.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_lightenv_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_world_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/intern/makesdna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lightenv.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-yukishiro/tools/btools.py
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/space_buttons.py
branches/soc-2009-yukishiro/release/ui/space_logic.py
Added: branches/soc-2009-yukishiro/release/ui/space_buttons.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_buttons.py
(rev 0)
+++ branches/soc-2009-yukishiro/release/ui/space_buttons.py 2009-06-22
21:52:22 UTC (rev 21085)
@@ -0,0 +1,36 @@
+
+import bpy
+
+class Buttons_HT_header(bpy.types.Header):
+ __space_type__ = "BUTTONS_WINDOW"
+ __idname__ = "BUTTONS_HT_header"
+
+ def draw(self, context):
+ layout = self.layout
+
+ so = context.space_data
+ scene = context.scene
+
+ layout.template_header(context)
+
+ if context.area.show_menus:
+ row = layout.row(align=True)
+ row.itemM(context, "Buttons_MT_view", text="View")
+
+ row = layout.row()
+ row.itemR(so, "buttons_context", expand=True, text="")
+ row.itemR(scene, "current_frame")
+
+class Buttons_MT_view(bpy.types.Menu):
+ __space_type__ = "BUTTONS_WINDOW"
+ __label__ = "View"
+
+ def draw(self, context):
+ layout = self.layout
+ so = context.space_data
+
+ col = layout.column()
+ col.itemR(so, "panel_alignment", expand=True)
+
+bpy.types.register(Buttons_HT_header)
+bpy.types.register(Buttons_MT_view)
\ No newline at end of file
Added: branches/soc-2009-yukishiro/release/ui/space_logic.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_logic.py
(rev 0)
+++ branches/soc-2009-yukishiro/release/ui/space_logic.py 2009-06-22
21:52:22 UTC (rev 21085)
@@ -0,0 +1,80 @@
+import bpy
+
+class LOGIC_PT_physics(bpy.types.Panel):
+ __space_type__ = "LOGIC_EDITOR"
+ __region_type__ = "UI"
+ __label__ = "Physics"
+
+ def draw(self, context):
+ layout = self.layout
+ ob = context.active_object
+
+ game = ob.game
+
+ flow = layout.column_flow()
+ flow.active = True
+ flow.itemR(game, "physics_type")
+ flow.itemR(game, "actor")
+
+ row = layout.row()
+ row.itemR(game, "ghost")
+ row.itemR(ob, "restrict_render", text="Invisible") # out of
place but useful
+
+ flow = layout.column_flow()
+ flow.itemR(game, "mass")
+ flow.itemR(game, "radius")
+ flow.itemR(game, "no_sleeping")
+ flow.itemR(game, "damping")
+ flow.itemR(game, "rotation_damping")
+ flow.itemR(game, "minimum_velocity")
+ flow.itemR(game, "maximum_velocity")
+
+ row = layout.row()
+ row.itemR(game, "do_fh")
+ row.itemR(game, "rotation_fh")
+
+ flow = layout.column_flow()
+ flow.itemR(game, "form_factor")
+ flow.itemR(game, "anisotropic_friction")
+
+ flow = layout.column_flow()
+ flow.active = game.anisotropic_friction
+ flow.itemR(game, "friction_coefficients")
+
+ split = layout.split()
+ sub = split.column()
+ sub.itemR(game, "lock_x_axis")
+ sub.itemR(game, "lock_y_axis")
+ sub.itemR(game, "lock_z_axis")
+ sub = split.column()
+ sub.itemR(game, "lock_x_rot_axis")
+ sub.itemR(game, "lock_y_rot_axis")
+ sub.itemR(game, "lock_z_rot_axis")
+
+
+class LOGIC_PT_collision_bounds(bpy.types.Panel):
+ __space_type__ = "LOGIC_EDITOR"
+ __region_type__ = "UI"
+ __label__ = "Collision Bounds"
+
+ def draw_header(self, context):
+ layout = self.layout
+ ob = context.active_object
+ game = ob.game
+
+ layout.itemR(game, "use_collision_bounds", text="")
+
+ def draw(self, context):
+ layout = self.layout
+
+ ob = context.scene.objects[0]
+ game = ob.game
+
+ flow = layout.column_flow()
+ flow.active = game.use_collision_bounds
+ flow.itemR(game, "collision_bounds")
+ flow.itemR(game, "collision_compound")
+ flow.itemR(game, "collision_margin")
+
+bpy.types.register(LOGIC_PT_physics)
+bpy.types.register(LOGIC_PT_collision_bounds)
Modified: branches/soc-2009-yukishiro/source/blender/SConscript
===================================================================
--- branches/soc-2009-yukishiro/source/blender/SConscript 2009-06-22
19:54:00 UTC (rev 21084)
+++ branches/soc-2009-yukishiro/source/blender/SConscript 2009-06-22
21:52:22 UTC (rev 21085)
@@ -13,12 +13,12 @@
'imbuf/intern/cineon/SConscript',
'makesdna/SConscript',
'makesrna/SConscript',
- 'nodes/SConscript',
+ 'nodes/SConscript',
'readblenfile/SConscript',
'render/SConscript',
'sh/SConscript',
'windowmanager/SConscript',
- 'blenfont/SConscript'])
+ 'blenfont/SConscript'])
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_global.h
2009-06-22 19:54:00 UTC (rev 21084)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_global.h
2009-06-22 21:52:22 UTC (rev 21085)
@@ -64,7 +64,7 @@
short afbreek, moving;
short background;
short winpos, displaymode; /* used to be in Render */
- short rendering; /* to indicate render is busy,
prevent renderwindow events etc */
+ short rendering; /* to indicate render is busy, prevent
renderwindow events etc */
short rt;
int f;
@@ -112,20 +112,20 @@
/* also uses G_FILE_AUTOPLAY */
#define G_RENDER_SHADOW (1 << 3)
#define G_BACKBUFSEL (1 << 4)
-#define G_PICKSEL (1 << 5)
+#define G_PICKSEL (1 << 5)
#define G_FACESELECT (1 << 8)
#define G_VERTEXPAINT (1 << 10)
-#define G_DEBUG (1 << 12)
+#define G_DEBUG (1 << 12)
#define G_DOSCRIPTLINKS (1 << 13)
-#define G_WEIGHTPAINT (1 << 15)
+#define G_WEIGHTPAINT (1 << 15)
#define G_TEXTUREPAINT (1 << 16)
/* #define G_NOFROZEN (1 << 17) also removed */
-#define G_GREASEPENCIL (1 << 17)
-#define G_LIGHTPAINT (1 << 19) // 18 is used, no?
+#define G_GREASEPENCIL (1 << 17)
+#define G_LIGHTPAINT (1 << 19) // 18 is used, no?
#define G_SCULPTMODE (1 << 29)
#define G_PARTICLEEDIT (1 << 30)
@@ -140,28 +140,28 @@
/* G.fileflags */
-#define G_AUTOPACK (1 << 0)
-#define G_FILE_COMPRESS (1 << 1)
-#define G_FILE_AUTOPLAY (1 << 2)
-#define G_FILE_ENABLE_ALL_FRAMES (1 << 3)
-#define G_FILE_SHOW_DEBUG_PROPS (1 << 4)
-#define G_FILE_SHOW_FRAMERATE (1 << 5)
-#define G_FILE_SHOW_PROFILE (1 << 6)
-#define G_FILE_LOCK (1 << 7)
-#define G_FILE_SIGN (1 << 8)
-#define G_FIle_PUBLISH (1 << 9)
-#define G_FILE_NO_UI (1 << 10)
-#define G_FILE_GAME_TO_IPO (1 << 11)
-#define G_FILE_GAME_MAT (1 << 12)
-#define G_FILE_DISPLAY_LISTS (1 << 13)
-#define G_FILE_SHOW_PHYSICS (1 << 14)
-#define G_FILE_GAME_MAT_GLSL (1 << 15)
-#define G_FILE_GLSL_NO_LIGHTS (1 << 16)
-#define G_FILE_GLSL_NO_SHADERS (1 << 17)
-#define G_FILE_GLSL_NO_SHADOWS (1 << 18)
-#define G_FILE_GLSL_NO_RAMPS (1 << 19)
-#define G_FILE_GLSL_NO_NODES (1 << 20)
-#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)
+#define G_AUTOPACK (1 << 0)
+#define G_FILE_COMPRESS (1 << 1)
+#define G_FILE_AUTOPLAY (1 << 2)
+#define G_FILE_ENABLE_ALL_FRAMES (1 << 3)
+#define G_FILE_SHOW_DEBUG_PROPS (1 << 4)
+#define G_FILE_SHOW_FRAMERATE (1 << 5)
+#define G_FILE_SHOW_PROFILE (1 << 6)
+#define G_FILE_LOCK (1 << 7)
+#define G_FILE_SIGN (1 << 8)
+#define G_FIle_PUBLISH (1 << 9)
+#define G_FILE_NO_UI (1 << 10)
+#define G_FILE_GAME_TO_IPO (1 << 11)
+#define G_FILE_GAME_MAT (1 << 12)
+#define G_FILE_DISPLAY_LISTS (1 << 13)
+#define G_FILE_SHOW_PHYSICS (1 << 14)
+#define G_FILE_GAME_MAT_GLSL (1 << 15)
+#define G_FILE_GLSL_NO_LIGHTS (1 << 16)
+#define G_FILE_GLSL_NO_SHADERS (1 << 17)
+#define G_FILE_GLSL_NO_SHADOWS (1 << 18)
+#define G_FILE_GLSL_NO_RAMPS (1 << 19)
+#define G_FILE_GLSL_NO_NODES (1 << 20)
+#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)
#define G_FILE_IGNORE_DEPRECATION_WARNINGS (1 << 22)
/* G.windowstate */
@@ -176,9 +176,9 @@
extern short ENDIAN_ORDER;
/* G.moving, signals drawing in (3d) window to denote transform */
-#define G_TRANSFORM_OBJ 1
-#define G_TRANSFORM_EDIT 2
-#define G_TRANSFORM_MANIP 4
+#define G_TRANSFORM_OBJ 1
+#define G_TRANSFORM_EDIT 2
+#define G_TRANSFORM_MANIP 4
#define G_TRANSFORM_PARTICLE 8
/* G.special1 */
@@ -189,7 +189,7 @@
#ifdef __cplusplus
}
#endif
-
+
#endif
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/brush.c
2009-06-22 19:54:00 UTC (rev 21084)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/brush.c
2009-06-22 21:52:22 UTC (rev 21085)
@@ -195,8 +195,8 @@
return &sce->toolsettings->wpaint->brush;
else if(G.f & G_TEXTUREPAINT)
return &sce->toolsettings->imapaint.brush;
- else if(G.f & G_LIGHTPAINT)
- return &sce->toolsettings->lpaint->brush;
+ else if(G.f & G_LIGHTPAINT)
+ return &sce->toolsettings->lpaint->brush;
return NULL;
}
Modified:
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
---
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cdderivedmesh.c
2009-06-22 19:54:00 UTC (rev 21084)
+++
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/cdderivedmesh.c
2009-06-22 21:52:22 UTC (rev 21085)
@@ -486,7 +486,7 @@
float *nors= dm->getFaceDataArray(dm, CD_NORMAL);
int i, orig, *index=0;
- if (!(G.f & G_LIGHTPAINT)) index = DM_get_face_data_layer(dm,
CD_ORIGINDEX);
+ if (!(G.f & G_LIGHTPAINT)) index = DM_get_face_data_layer(dm,
CD_ORIGINDEX);
mc = DM_get_face_data_layer(dm, CD_WEIGHT_MCOL);
if(!mc)
@@ -721,11 +721,10 @@
glEnd();
}
-static void cdDM_foreachMappedVert(
- DerivedMesh *dm,
- void (*func)(void *userData, int index, float *co,
- float *no_f, short *no_s),
- void *userData)
+static void cdDM_foreachMappedVert(DerivedMesh *dm,
+ void (*func)(void *userData, int index,
float *co,
+ float *no_f, short *no_s),
+ void *userData)
{
MVert *mv = CDDM_get_verts(dm);
int i, orig, *index = DM_get_vert_data_layer(dm, CD_ORIGINDEX);
@@ -741,11 +740,10 @@
}
}
-static void cdDM_foreachMappedEdge(
- DerivedMesh *dm,
- void (*func)(void *userData, int index,
- float *v0co, float *v1co),
- void *userData)
+static void cdDM_foreachMappedEdge(DerivedMesh *dm,
+ void (*func)(void *userData, int index,
+ float *v0co, float *v1co),
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
