[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27596] branches/render25: revert unintentional files from r27594

Campbell Barton ideasman42 at gmail.com
Thu Mar 18 12:14:44 CET 2010


Revision: 27596
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27596
Author:   campbellbarton
Date:     2010-03-18 12:14:44 +0100 (Thu, 18 Mar 2010)

Log Message:
-----------
revert unintentional files from r27594

Modified Paths:
--------------
    branches/render25/release/scripts/ui/properties_particle.py
    branches/render25/source/blender/blenkernel/intern/collision.c
    branches/render25/source/blender/blenkernel/intern/pointcache.c
    branches/render25/source/blender/imbuf/intern/util.c
    branches/render25/source/blender/makesrna/intern/rna_object_force.c

Modified: branches/render25/release/scripts/ui/properties_particle.py
===================================================================
--- branches/render25/release/scripts/ui/properties_particle.py	2010-03-18 11:12:12 UTC (rev 27595)
+++ branches/render25/release/scripts/ui/properties_particle.py	2010-03-18 11:14:44 UTC (rev 27596)
@@ -27,7 +27,7 @@
 
 
 def particle_panel_enabled(context, psys):
-    return True # return (psys.point_cache.baked is False) and (not psys.edited) and (not context.particle_system_editable)
+    return (psys.point_cache.baked is False) and (not psys.edited) and (not context.particle_system_editable)
 
 
 def particle_panel_poll(context):

Modified: branches/render25/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/collision.c	2010-03-18 11:12:12 UTC (rev 27595)
+++ branches/render25/source/blender/blenkernel/intern/collision.c	2010-03-18 11:14:44 UTC (rev 27596)
@@ -1315,7 +1315,7 @@
 	for ( base = scene->base.first; base; base = base->next )
 	{
 		/*Only proceed for mesh object in same layer */
-		if(!(base->lay & self->lay))
+		if(!(base->object->type==OB_MESH && (base->lay & self->lay))) 
 			continue;
 		
 		coll_ob = base->object;
@@ -1323,7 +1323,7 @@
 		if(coll_ob == self)
 				continue;
 		
-		if(coll_ob->type == OB_MESH && coll_ob->pd && coll_ob->pd->deflect)
+		if(coll_ob->pd && coll_ob->pd->deflect)
 		{
 			collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
 		}
@@ -1363,7 +1363,7 @@
 					if(coll_ob == self)
 						continue;
 					
-					if(coll_ob->type == OB_MESH && coll_ob->pd && coll_ob->pd->deflect)
+					if(coll_ob->pd && coll_ob->pd->deflect)
 					{
 						collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
 					}

Modified: branches/render25/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/pointcache.c	2010-03-18 11:12:12 UTC (rev 27595)
+++ branches/render25/source/blender/blenkernel/intern/pointcache.c	2010-03-18 11:14:44 UTC (rev 27596)
@@ -1134,8 +1134,8 @@
 	char filename[(FILE_MAXDIR+FILE_MAXFILE)*2];
 
 	/* don't allow writing for linked objects */
-//	if(pid->ob->id.lib && mode == PTCACHE_FILE_WRITE)
-//		return NULL;
+	if(pid->ob->id.lib && mode == PTCACHE_FILE_WRITE)
+		return NULL;
 
 	if (!G.relbase_valid && (pid->cache->flag & PTCACHE_EXTERNAL)==0) return NULL; /* save blend file before using disk pointcache */
 	
@@ -1875,8 +1875,8 @@
 		return;
 
 	/* don't allow clearing for linked objects */
-//	if(pid->ob->id.lib)
-//		return;
+	if(pid->ob->id.lib)
+		return;
 
 	/*if (!G.relbase_valid) return; *//* save blend file before using pointcache */
 	

Modified: branches/render25/source/blender/imbuf/intern/util.c
===================================================================
--- branches/render25/source/blender/imbuf/intern/util.c	2010-03-18 11:12:12 UTC (rev 27595)
+++ branches/render25/source/blender/imbuf/intern/util.c	2010-03-18 11:14:44 UTC (rev 27596)
@@ -383,11 +383,6 @@
 
 	if(UTIL_DEBUG) printf("in getanimtype: %s\n", name);
 
-	if (ib_stat(name,&st) == -1) return(0);
-	if (((st.st_mode) & S_IFMT) != S_IFREG) return(0);
-
-	if (isavi(name)) return (ANIM_AVI);
-
 #ifndef _WIN32
 #	ifdef WITH_QUICKTIME
 	if (isqtime(name)) return (ANIM_QTIME);
@@ -396,9 +391,13 @@
 	/* stat test below fails on large files > 4GB */
 	if (isffmpeg(name)) return (ANIM_FFMPEG);
 #	endif
+	if (ib_stat(name,&st) == -1) return(0);
+	if (((st.st_mode) & S_IFMT) != S_IFREG) return(0);
+
+	if (isavi(name)) return (ANIM_AVI);
+
 	if (ismovie(name)) return (ANIM_MOVIE);
 #else
-
 	if (ib_stat(name,&st) == -1) return(0);
 	if (((st.st_mode) & S_IFMT) != S_IFREG) return(0);
 

Modified: branches/render25/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_object_force.c	2010-03-18 11:12:12 UTC (rev 27595)
+++ branches/render25/source/blender/makesrna/intern/rna_object_force.c	2010-03-18 11:14:44 UTC (rev 27596)
@@ -680,12 +680,12 @@
 	
 	prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "startframe");
-	RNA_def_property_range(prop, -MAXFRAME, MAXFRAME);
+	RNA_def_property_range(prop, 1, 300000);
 	RNA_def_property_ui_text(prop, "Start", "Frame on which the simulation starts");
 	
 	prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "endframe");
-	RNA_def_property_range(prop, -MAXFRAME, MAXFRAME);
+	RNA_def_property_range(prop, 1, 300000);
 	RNA_def_property_ui_text(prop, "End", "Frame on which the simulation stops");
 
 	prop= RNA_def_property(srna, "step", PROP_INT, PROP_NONE);





More information about the Bf-blender-cvs mailing list