[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29240] trunk/blender/source: get rid of some warnings,

Campbell Barton ideasman42 at gmail.com
Sat Jun 5 17:31:55 CEST 2010


Revision: 29240
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29240
Author:   campbellbarton
Date:     2010-06-05 17:31:55 +0200 (Sat, 05 Jun 2010)

Log Message:
-----------
get rid of some warnings,
removed NG_LoopBackNetworkDeviceInterface::GetNetworkVersion(), wasnt used anywhere.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/editors/object/object_edit.c
    trunk/blender/source/blender/editors/space_outliner/outliner.c
    trunk/blender/source/blender/imbuf/intern/anim.c
    trunk/blender/source/blender/makesrna/RNA_types.h
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/python/intern/bpy_props.c
    trunk/blender/source/blender/python/intern/bpy_props.h
    trunk/blender/source/blender/python/intern/bpy_rna.c
    trunk/blender/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
    trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
    trunk/blender/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h
    trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -362,7 +362,7 @@
 	}
 
 	if (c->pix_fmt != PIX_FMT_BGR32) {
-		sws_scale(img_convert_ctx, (const uint8_t * const*) rgb_frame->data,
+		sws_scale(img_convert_ctx, (uint8_t **) rgb_frame->data,
 			  rgb_frame->linesize, 0, c->height, 
 			  current_frame->data, current_frame->linesize);
 		delete_picture(rgb_frame);

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -2306,9 +2306,6 @@
 
 static int game_property_clear_exec(bContext *C, wmOperator *op)
 {
-	Object *ob=ED_object_active_context(C);
-	bProperty *prop;
-
 	CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
 		free_properties(&ob_iter->prop);
 	}

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -132,8 +132,7 @@
 static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene, ARegion *ar, SpaceOops *soops, TreeElement *te, int startx, int *starty);
 static void outliner_do_object_operation(bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb, 
 										 void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *));
-static void outliner_do_group_operation(bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb, 
- 										 void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *));
+
 static int group_select_flag(Group *gr);
 
 /* ******************** PERSISTANT DATA ***************** */
@@ -3330,31 +3329,6 @@
 	}
 }
 
-static void outliner_do_group_operation(bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb, 
- 										 void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *))
- {
- 	TreeElement *te;
- 	TreeStoreElem *tselem;
- 	
- 	for(te=lb->first; te; te= te->next) {
- 		tselem= TREESTORE(te);
- 		if(tselem->flag & TSE_SELECTED) {
- 			if(tselem->type==0 && te->idcode==ID_GR) {
- 				/* when objects selected in other scenes... dunno if that should be allowed */
- 				Scene *sce= (Scene *)outliner_search_back(soops, te, ID_SCE);
- 				if(sce && scene != sce) {
- 					ED_screen_set_scene(C, sce);
- 				}
- 				
- 				operation_cb(C, scene, te, NULL, tselem);
- 			}
- 		}
-		if((tselem->flag & TSE_CLOSED)==0) {
- 			outliner_do_group_operation(C, scene, soops, &te->subtree, operation_cb);
-		}
-	}
-}
-
 void outliner_del(bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops)
 {
 	

Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/imbuf/intern/anim.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -816,7 +816,7 @@
 					unsigned char* top;
 
 					sws_scale(anim->img_convert_ctx,
-						  (const uint8_t * const *)input->data,
+						  (uint8_t **)input->data,
 						  input->linesize,
 						  0,
 						  anim->pCodecCtx->height,
@@ -875,7 +875,7 @@
 					unsigned char* r;
 	
 					sws_scale(anim->img_convert_ctx,
-						  (const uint8_t * const *)input->data,
+						  (uint8_t **)input->data,
 						  input->linesize,
 						  0,
 						  anim->pCodecCtx->height,

Modified: trunk/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_types.h	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/makesrna/RNA_types.h	2010-06-05 15:31:55 UTC (rev 29240)
@@ -118,6 +118,7 @@
 	PROP_QUATERNION = 27,
 	PROP_AXISANGLE = 28,
 	PROP_XYZ = 29,
+	PROP_XYZ_LENGTH = 29|PROP_UNIT_LENGTH,
 	PROP_COLOR_GAMMA = 30,
 
 	/* booleans */

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -1630,7 +1630,7 @@
 	RNA_def_property_ui_text(prop, "Scale", "Scaling of the object");
 	RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_update");
 
-	prop= RNA_def_property(srna, "dimensions", PROP_FLOAT, PROP_XYZ|PROP_UNIT_LENGTH);
+	prop= RNA_def_property(srna, "dimensions", PROP_FLOAT, PROP_XYZ_LENGTH);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_float_funcs(prop, "rna_Object_dimensions_get", "rna_Object_dimensions_set", NULL);
 	RNA_def_property_ui_text(prop, "Dimensions", "Absolute bounding box dimensions of the object");

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -2907,7 +2907,7 @@
 	RNA_def_property_ui_text(prop, "World", "World used for rendering the scene");
 	RNA_def_property_update(prop, NC_SCENE|NC_WORLD, NULL);
 
-	prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ|PROP_UNIT_LENGTH);
+	prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ_LENGTH);
 	RNA_def_property_float_sdna(prop, NULL, "cursor");
 	RNA_def_property_ui_text(prop, "Cursor Location", "3D cursor location");
 	RNA_def_property_ui_range(prop, -10000.0, 10000.0, 10, 4);

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -976,7 +976,7 @@
 	RNA_def_property_pointer_sdna(prop, NULL, "localvd");
 	RNA_def_property_ui_text(prop, "Local View", "Display an isolated sub-set of objects, apart from the scene visibility");
 	
-	prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ|PROP_UNIT_LENGTH);
+	prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ_LENGTH);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_float_funcs(prop, "rna_View3D_CursorLocation_get", "rna_View3D_CursorLocation_set", NULL);
 	RNA_def_property_ui_text(prop, "3D Cursor Location", "3D cursor location for this view (dependent on local view setting)");

Modified: trunk/blender/source/blender/python/intern/bpy_props.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_props.c	2010-06-05 14:35:07 UTC (rev 29239)
+++ trunk/blender/source/blender/python/intern/bpy_props.c	2010-06-05 15:31:55 UTC (rev 29240)
@@ -86,17 +86,19 @@
 	return ret;
 }
 
+#if 0
 static int bpy_struct_id_used(StructRNA *srna, char *identifier)
 {
 	PointerRNA ptr;
 	RNA_pointer_create(NULL, srna, NULL, &ptr);
 	return (RNA_struct_find_property(&ptr, identifier) != NULL);
 }
+#endif
 
 
 /* Function that sets RNA, NOTE - self is NULL when called from python, but being abused from C so we can pass the srna allong
  * This isnt incorrect since its a python object - but be careful */
-static char BPy_BoolProperty_doc[] =
+char BPy_BoolProperty_doc[] =
 ".. function:: BoolProperty(name=\"\", description=\"\", default=False, options={'ANIMATABLE'}, subtype='NONE')\n"
 "\n"
 "   Returns a new boolean property definition.\n"
@@ -162,7 +164,7 @@
 	}
 }
 
-static char BPy_BoolVectorProperty_doc[] =
+char BPy_BoolVectorProperty_doc[] =
 ".. function:: BoolVectorProperty(name=\"\", description=\"\", default=(False, False, False), options={'ANIMATABLE'}, subtype='NONE', size=3)\n"
 "\n"
 "   Returns a new vector boolean property definition.\n"
@@ -238,7 +240,7 @@
 	}
 }
 
-static char BPy_IntProperty_doc[] =
+char BPy_IntProperty_doc[] =
 ".. function:: IntProperty(name=\"\", description=\"\", default=0, min=-sys.maxint, max=sys.maxint, soft_min=-sys.maxint, soft_max=sys.maxint, step=1, options={'ANIMATABLE'}, subtype='NONE')\n"
 "\n"
 "   Returns a new int property definition.\n"
@@ -304,7 +306,7 @@
 	}
 }
 
-static char BPy_IntVectorProperty_doc[] =
+char BPy_IntVectorProperty_doc[] =
 ".. function:: IntVectorProperty(name=\"\", description=\"\", default=(0, 0, 0), min=-sys.maxint, max=sys.maxint, soft_min=-sys.maxint, soft_max=sys.maxint, options={'ANIMATABLE'}, subtype='NONE', size=3)\n"
 "\n"
 "   Returns a new vector int property definition.\n"
@@ -382,7 +384,7 @@
 }
 
 
-static char BPy_FloatProperty_doc[] =
+char BPy_FloatProperty_doc[] =
 ".. function:: FloatProperty(name=\"\", description=\"\", default=0.0, min=sys.float_info.min, max=sys.float_info.max, soft_min=sys.float_info.min, soft_max=sys.float_info.max, step=3, precision=2, options={'ANIMATABLE'}, subtype='NONE', unit='NONE')\n"
 "\n"
 "   Returns a new float property definition.\n"
@@ -458,7 +460,7 @@
 	}
 }
 
-static char BPy_FloatVectorProperty_doc[] =
+char BPy_FloatVectorProperty_doc[] =
 ".. function:: FloatVectorProperty(name=\"\", description=\"\", default=(0.0, 0.0, 0.0), min=sys.float_info.min, max=sys.float_info.max, soft_min=sys.float_info.min, soft_max=sys.float_info.max, step=3, precision=2, options={'ANIMATABLE'}, subtype='NONE', size=3)\n"
 "\n"
 "   Returns a new vector float property definition.\n"
@@ -535,7 +537,7 @@
 	}
 }
 
-static char BPy_StringProperty_doc[] =
+char BPy_StringProperty_doc[] =
 ".. function:: StringProperty(name=\"\", description=\"\", default=\"\", maxlen=0, options={'ANIMATABLE'}, subtype='NONE')\n"
 "\n"
 "   Returns a new string property definition.\n"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list