Revision: 21144
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21144
Author: aligorith
Date: 2009-06-25 03:08:14 +0200 (Thu, 25 Jun 2009)
Log Message:
-----------
Second attempt at overwriting invalid files with sane line-endings
Modified Paths:
--------------
branches/soc-2009-aligorith/release/ui/buttons_data_lattice.py
branches/soc-2009-aligorith/source/blender/editors/physics/ed_pointcache.c
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_lattice.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_lattice.py
2009-06-25 00:21:39 UTC (rev 21143)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_lattice.py
2009-06-25 01:08:14 UTC (rev 21144)
@@ -1,54 +1,54 @@
-
-import bpy
-
-class DataButtonsPanel(bpy.types.Panel):
- __space_type__ = "BUTTONS_WINDOW"
- __region_type__ = "WINDOW"
- __context__ = "data"
-
- def poll(self, context):
- return (context.lattice != None)
-
-class DATA_PT_lattice(DataButtonsPanel):
- __idname__ = "DATA_PT_lattice"
- __label__ = "Lattice"
-
- def poll(self, context):
- return (context.object and context.object.type == 'LATTICE')
-
- def draw(self, context):
- layout = self.layout
-
- ob = context.object
- lat = context.lattice
- space = context.space_data
-
- split = layout.split(percentage=0.65)
-
- if ob:
- split.template_ID(context, ob, "data")
- split.itemS()
- elif lat:
- split.template_ID(context, space, "pin_id")
- split.itemS()
-
- if lat:
- layout.itemS()
-
- row = layout.row()
- row.itemR(lat, "points_u")
- row.itemR(lat, "interpolation_type_u", expand=True)
-
- row = layout.row()
- row.itemR(lat, "points_v")
- row.itemR(lat, "interpolation_type_v", expand=True)
-
- row = layout.row()
- row.itemR(lat, "points_w")
- row.itemR(lat, "interpolation_type_w", expand=True)
-
- row = layout.row()
- row.itemR(lat, "outside")
- row.itemR(lat, "shape_keys")
-
-bpy.types.register(DATA_PT_lattice)
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "data"
+
+ def poll(self, context):
+ return (context.lattice != None)
+
+class DATA_PT_lattice(DataButtonsPanel):
+ __idname__ = "DATA_PT_lattice"
+ __label__ = "Lattice"
+
+ def poll(self, context):
+ return (context.object and context.object.type == 'LATTICE')
+
+ def draw(self, context):
+ layout = self.layout
+
+ ob = context.object
+ lat = context.lattice
+ space = context.space_data
+
+ split = layout.split(percentage=0.65)
+
+ if ob:
+ split.template_ID(context, ob, "data")
+ split.itemS()
+ elif lat:
+ split.template_ID(context, space, "pin_id")
+ split.itemS()
+
+ if lat:
+ layout.itemS()
+
+ row = layout.row()
+ row.itemR(lat, "points_u")
+ row.itemR(lat, "interpolation_type_u", expand=True)
+
+ row = layout.row()
+ row.itemR(lat, "points_v")
+ row.itemR(lat, "interpolation_type_v", expand=True)
+
+ row = layout.row()
+ row.itemR(lat, "points_w")
+ row.itemR(lat, "interpolation_type_w", expand=True)
+
+ row = layout.row()
+ row.itemR(lat, "outside")
+ row.itemR(lat, "shape_keys")
+
+bpy.types.register(DATA_PT_lattice)
Modified:
branches/soc-2009-aligorith/source/blender/editors/physics/ed_pointcache.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/physics/ed_pointcache.c
2009-06-25 00:21:39 UTC (rev 21143)
+++ branches/soc-2009-aligorith/source/blender/editors/physics/ed_pointcache.c
2009-06-25 01:08:14 UTC (rev 21144)
@@ -56,11 +56,11 @@
#include "RNA_define.h"
#include "physics_intern.h"
-
-static int cache_break_test(void *cbd) {
- return G.afbreek==1;
-}
-/**************************** general **********************************/
+
+static int cache_break_test(void *cbd) {
+ return G.afbreek==1;
+}
+/**************************** general **********************************/
static int ptcache_bake_all_poll(bContext *C)
{
Scene *scene= CTX_data_scene(C);
@@ -99,13 +99,13 @@
PTCacheID *pid;
ListBase pidlist;
- for(base=scene->base.first; base; base= base->next) {
- BKE_ptcache_ids_from_object(&pidlist, base->object);
-
- for(pid=pidlist.first; pid; pid=pid->next) {
- pid->cache->flag &= ~PTCACHE_BAKED;
- BKE_ptcache_id_reset(scene, pid,
PTCACHE_RESET_OUTDATED);
- }
+ for(base=scene->base.first; base; base= base->next) {
+ BKE_ptcache_ids_from_object(&pidlist, base->object);
+
+ for(pid=pidlist.first; pid; pid=pid->next) {
+ pid->cache->flag &= ~PTCACHE_BAKED;
+ BKE_ptcache_id_reset(scene, pid,
PTCACHE_RESET_OUTDATED);
+ }
}
BLI_freelistN(&pidlist);
@@ -113,7 +113,7 @@
WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
return OPERATOR_FINISHED;
-}
+}
void PTCACHE_OT_bake_all(wmOperatorType *ot)
{
@@ -141,7 +141,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
-
+
/**************************** particles **********************************/
static int ptcache_bake_particle_system_poll(bContext *C)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
