[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21169] branches/soc-2009-kazanbas: Merge from 2.5 r21112 through r21160
Arystanbek Dyussenov
arystan.d at gmail.com
Fri Jun 26 15:00:24 CEST 2009
Revision: 21169
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21169
Author: kazanbas
Date: 2009-06-26 15:00:23 +0200 (Fri, 26 Jun 2009)
Log Message:
-----------
Merge from 2.5 r21112 through r21160
Modified Paths:
--------------
branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py
branches/soc-2009-kazanbas/release/ui/space_text.py
branches/soc-2009-kazanbas/source/blender/blenfont/BLF_api.h
branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h
branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_material.h
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c
branches/soc-2009-kazanbas/source/blender/blenkernel/intern/material.c
branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c
branches/soc-2009-kazanbas/source/blender/blenloader/intern/writefile.c
branches/soc-2009-kazanbas/source/blender/editors/curve/curve_intern.h
branches/soc-2009-kazanbas/source/blender/editors/curve/curve_ops.c
branches/soc-2009-kazanbas/source/blender/editors/curve/editcurve.c
branches/soc-2009-kazanbas/source/blender/editors/curve/editfont.c
branches/soc-2009-kazanbas/source/blender/editors/include/ED_curve.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_mesh.h
branches/soc-2009-kazanbas/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-kazanbas/source/blender/editors/include/UI_interface.h
branches/soc-2009-kazanbas/source/blender/editors/interface/interface.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_icons.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_intern.h
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_layout.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_regions.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_style.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_templates.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_utils.c
branches/soc-2009-kazanbas/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-kazanbas/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-kazanbas/source/blender/editors/preview/previewrender.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/file_draw.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/file_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_file/filesel.c
branches/soc-2009-kazanbas/source/blender/editors/space_image/image_buttons.c
branches/soc-2009-kazanbas/source/blender/editors/space_image/image_ops.c
branches/soc-2009-kazanbas/source/blender/editors/space_info/info_header.c
branches/soc-2009-kazanbas/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-kazanbas/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.c
branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.c
branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.h
branches/soc-2009-kazanbas/source/blender/python/generic/euler.c
branches/soc-2009-kazanbas/source/blender/python/generic/euler.h
branches/soc-2009-kazanbas/source/blender/python/generic/matrix.c
branches/soc-2009-kazanbas/source/blender/python/generic/matrix.h
branches/soc-2009-kazanbas/source/blender/python/generic/quat.c
branches/soc-2009-kazanbas/source/blender/python/generic/quat.h
branches/soc-2009-kazanbas/source/blender/python/generic/vector.c
branches/soc-2009-kazanbas/source/blender/python/generic/vector.h
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2009-kazanbas/source/gameengine/Expressions/KX_Python.h
branches/soc-2009-kazanbas/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2009-kazanbas/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
Modified: branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py 2009-06-26 13:00:23 UTC (rev 21169)
@@ -14,7 +14,7 @@
__label__ = "Mesh"
def poll(self, context):
- return (context.object.type == 'MESH')
+ return (context.object and context.object.type == 'MESH')
def draw(self, context):
layout = self.layout
@@ -46,6 +46,34 @@
sub.itemR(mesh, "vertex_normal_flip")
sub.itemR(mesh, "double_sided")
- layout.itemR(mesh, "texco_mesh")
-
-bpy.types.register(DATA_PT_mesh)
\ No newline at end of file
+ layout.itemR(mesh, "texco_mesh")
+
+
+class DATA_PT_materials(DataButtonsPanel):
+ __idname__ = "DATA_PT_materials"
+ __label__ = "Materials"
+
+ def poll(self, context):
+ return (context.object and context.object.type in ('MESH', 'CURVE', 'FONT', 'SURFACE'))
+
+ def draw(self, context):
+ layout = self.layout
+ ob = context.object
+
+ row = layout.row()
+
+ row.template_list(ob, "materials", "active_material_index")
+
+ col = row.column(align=True)
+ col.itemO("OBJECT_OT_material_slot_add", icon="ICON_ZOOMIN", text="")
+ col.itemO("OBJECT_OT_material_slot_remove", icon="ICON_ZOOMOUT", text="")
+
+ row = layout.row(align=True)
+
+ row.itemO("OBJECT_OT_material_slot_assign", text="Assign");
+ row.itemO("OBJECT_OT_material_slot_select", text="Select");
+ row.itemO("OBJECT_OT_material_slot_deselect", text="Deselect");
+
+bpy.types.register(DATA_PT_mesh)
+bpy.types.register(DATA_PT_materials)
+
Modified: branches/soc-2009-kazanbas/release/ui/space_text.py
===================================================================
--- branches/soc-2009-kazanbas/release/ui/space_text.py 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/release/ui/space_text.py 2009-06-26 13:00:23 UTC (rev 21169)
@@ -1,10 +1,6 @@
import bpy
-# temporary
-ICON_TEXT = 120
-ICON_HELP = 1
-
class TEXT_HT_header(bpy.types.Header):
__space_type__ = "TEXT_EDITOR"
__idname__ = "TEXT_HT_header"
Modified: branches/soc-2009-kazanbas/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenfont/BLF_api.h 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenfont/BLF_api.h 2009-06-26 13:00:23 UTC (rev 21169)
@@ -135,6 +135,7 @@
#define BLF_FONT_KERNING (1<<2)
#define BLF_USER_KERNING (1<<3)
#define BLF_SHADOW (1<<4)
+#define BLF_OVERLAP_CHAR (1<<5)
/* font->mode. */
#define BLF_MODE_TEXTURE 0
Modified: branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c 2009-06-26 13:00:23 UTC (rev 21169)
@@ -146,20 +146,22 @@
if (FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta) == 0) {
pen_x += delta.x >> 6;
-/*
- if (pen_x < old_pen_x)
- pen_x= old_pen_x;
-*/
+
+ if (font->flags & BLF_OVERLAP_CHAR) {
+ if (pen_x < old_pen_x)
+ pen_x= old_pen_x;
+ }
}
}
if (font->flags & BLF_USER_KERNING) {
old_pen_x= pen_x;
pen_x += font->kerning;
-/*
- if (pen_x < old_pen_x)
- pen_x= old_pen_x;
-*/
+
+ if (font->flags & BLF_OVERLAP_CHAR) {
+ if (pen_x < old_pen_x)
+ pen_x= old_pen_x;
+ }
}
/* do not return this loop if clipped, we want every character tested */
@@ -228,20 +230,22 @@
if (FT_Get_Kerning(font->face, g_prev_index, glyph_index, FT_KERNING_UNFITTED, &delta) == 0) {
pen_x += delta.x >> 6;
-/*
- if (pen_x < old_pen_x)
- old_pen_x= pen_x;
-*/
+
+ if (font->flags & BLF_OVERLAP_CHAR) {
+ if (pen_x < old_pen_x)
+ pen_x= old_pen_x;
+ }
}
}
if (font->flags & BLF_USER_KERNING) {
old_pen_x= pen_x;
pen_x += font->kerning;
-/*
- if (pen_x < old_pen_x)
- old_pen_x= pen_x;
-*/
+
+ if (font->flags & BLF_OVERLAP_CHAR) {
+ if (pen_x < old_pen_x)
+ pen_x= old_pen_x;
+ }
}
gbox.xmin= g->box.xmin + pen_x;
Modified: branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_glyph.c 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_glyph.c 2009-06-26 13:00:23 UTC (rev 21169)
@@ -500,6 +500,8 @@
float color[4];
gt= g->tex_data;
+ xo= 0.0f;
+ yo= 0.0f;
if (font->flags & BLF_SHADOW) {
xo= x;
Modified: branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_context.h 2009-06-26 13:00:23 UTC (rev 21169)
@@ -131,6 +131,7 @@
- the dir listbase consits of LinkData items */
PointerRNA CTX_data_pointer_get(const bContext *C, const char *member);
+PointerRNA CTX_data_pointer_get_type(const bContext *C, const char *member, StructRNA *type);
ListBase CTX_data_collection_get(const bContext *C, const char *member);
ListBase CTX_data_dir_get(const bContext *C);
void CTX_data_get(const bContext *C, const char *member, PointerRNA *r_ptr, ListBase *r_lb);
Modified: branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_material.h
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_material.h 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_material.h 2009-06-26 13:00:23 UTC (rev 21169)
@@ -39,6 +39,8 @@
struct ID;
struct Object;
+/* materials */
+
void init_def_material(void);
void free_material(struct Material *sc);
void test_object_materials(struct ID *id);
@@ -47,16 +49,23 @@
struct Material *copy_material(struct Material *ma);
void make_local_material(struct Material *ma);
+void automatname(struct Material *);
+
+/* material slots */
+
struct Material ***give_matarar(struct Object *ob);
short *give_totcolp(struct Object *ob);
struct Material *give_current_material(struct Object *ob, int act);
struct ID *material_from(struct Object *ob, int act);
void assign_material(struct Object *ob, struct Material *ma, int act);
-void new_material_to_objectdata(struct Object *ob);
int find_material_index(struct Object *ob, struct Material *ma);
+void object_add_material_slot(struct Object *ob);
+void object_remove_material_slot(struct Object *ob);
+/* rendering */
+
void init_render_material(struct Material *, int, float *);
void init_render_materials(int, float *);
void end_render_material(struct Material *);
@@ -64,12 +73,8 @@
int material_in_material(struct Material *parmat, struct Material *mat);
-void automatname(struct Material *);
-void delete_material_index(struct Object *ob);
-
void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col);
-
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenkernel/intern/anim_sys.c 2009-06-26 13:00:23 UTC (rev 21169)
@@ -43,6 +43,7 @@
case ID_OB:
case ID_CU:
case ID_KE:
+ case ID_PA:
case ID_MA: case ID_TE: case ID_NT:
case ID_LA: case ID_CA: case ID_WO:
case ID_SCE:
@@ -883,6 +884,9 @@
/* meshes */
// TODO...
+ /* particles */
+ EVAL_ANIM_IDS(main->particle.first, ADT_RECALC_ANIM);
+
/* objects */
/* ADT_RECALC_ANIM doesn't need to be supplied here, since object AnimData gets
* this tagged by Depsgraph on framechange
Modified: branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenkernel/intern/context.c 2009-06-26 13:00:23 UTC (rev 21169)
@@ -365,15 +365,20 @@
{
bContextDataResult result;
- if(ctx_data_get((bContext*)C, member, &result)) {
+ if(ctx_data_get((bContext*)C, member, &result))
return result.ptr;
- }
- else {
- PointerRNA ptr;
- memset(&ptr, 0, sizeof(ptr));
+ else
+ return PointerRNA_NULL;
+}
+
+PointerRNA CTX_data_pointer_get_type(const bContext *C, const char *member, StructRNA *type)
+{
+ PointerRNA ptr = CTX_data_pointer_get(C, member);
+
+ if(ptr.data && ptr.type == type)
return ptr;
- }
-
+
+ return PointerRNA_NULL;
}
ListBase CTX_data_collection_get(const bContext *C, const char *member)
Modified: branches/soc-2009-kazanbas/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenkernel/intern/material.c 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenkernel/intern/material.c 2009-06-26 13:00:23 UTC (rev 21169)
@@ -615,7 +615,7 @@
return 0;
}
-void new_material_to_objectdata(Object *ob)
+void object_add_material_slot(Object *ob)
{
Material *ma;
@@ -854,7 +854,7 @@
}
-void delete_material_index(Object *ob)
+void object_remove_material_slot(Object *ob)
{
Material *mao, ***matarar;
Object *obt;
Modified: branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c 2009-06-26 12:55:46 UTC (rev 21168)
+++ branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c 2009-06-26 13:00:23 UTC (rev 21169)
@@ -2899,7 +2899,9 @@
part= main->particle.first;
while(part) {
if(part->id.flag & LIB_NEEDLINK) {
+ if (part->adt) lib_link_animdata(fd, &part->id, part->adt);
part->ipo= newlibadr_us(fd, part->id.lib, part->ipo); // XXX depreceated - old animation system
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list