[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36638] branches/bmesh/blender: manually copy more changes from trunk.
Campbell Barton
ideasman42 at gmail.com
Thu May 12 11:02:39 CEST 2011
Revision: 36638
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36638
Author: campbellbarton
Date: 2011-05-12 09:02:39 +0000 (Thu, 12 May 2011)
Log Message:
-----------
manually copy more changes from trunk.
Modified Paths:
--------------
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
branches/bmesh/blender/source/blender/makesdna/DNA_color_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_key_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/SConscript
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/creator/creator.c
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -52,6 +52,9 @@
#ifndef RID_INPUT
#define RID_INPUT 0x10000003
#endif
+#ifndef RIM_INPUTSINK
+#define RIM_INPUTSINK 0x1
+#endif
#ifndef RI_KEY_BREAK
#define RI_KEY_BREAK 0x1
#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/context.c 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/context.c 2011-05-12 09:02:39 UTC (rev 36638)
@@ -44,20 +44,16 @@
#include "RNA_access.h"
-#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_string.h"
-#include "PIL_time.h"
#include "BKE_context.h"
#include "BKE_main.h"
#include "BKE_screen.h"
-#ifndef DISABLE_PYTHON
#ifdef WITH_PYTHON
#include "BPY_extern.h"
#endif
-#endif
/* struct */
Modified: branches/bmesh/blender/source/blender/editors/interface/resources.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/resources.c 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/editors/interface/resources.c 2011-05-12 09:02:39 UTC (rev 36638)
@@ -404,6 +404,7 @@
case TH_DOPESHEET_CHANNELSUBOB:
cp= ts->ds_subchannel;
break;
+
case TH_PREVIEW_BACK:
cp= ts->preview_back;
break;
@@ -638,9 +639,6 @@
SETCOL(btheme->tv3d.bone_solid, 200, 200, 200, 255);
SETCOL(btheme->tv3d.bone_pose, 80, 200, 255, 80); // alpha 80 is not meant editable, used for wire+action draw
-
- SETCOL(btheme->tv3d.pin, 115, 171, 209, 255);
- btheme->tv3d.pin_opac = 40;
/* space buttons */
Modified: branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c 2011-05-12 09:02:39 UTC (rev 36638)
@@ -1240,7 +1240,7 @@
Base *base;
Lamp *la;
int count;
- float position[4], direction[4], energy[4], power;
+ float position[4], direction[4], energy[4];
/* disable all lights */
for(count=0; count<8; count++)
@@ -1281,8 +1281,8 @@
glLightfv(GL_LIGHT0+count, GL_POSITION, position);
glLightf(GL_LIGHT0+count, GL_CONSTANT_ATTENUATION, 1.0);
- glLightf(GL_LIGHT0+count, GL_LINEAR_ATTENUATION, 0.0f/la->dist);
- glLightf(GL_LIGHT0+count, GL_QUADRATIC_ATTENUATION, 1.0f/(la->dist*la->dist));
+ glLightf(GL_LIGHT0+count, GL_LINEAR_ATTENUATION, la->att1/la->dist);
+ glLightf(GL_LIGHT0+count, GL_QUADRATIC_ATTENUATION, la->att2/(la->dist*la->dist));
if(la->type==LA_SPOT) {
/* spot lamp */
@@ -1294,8 +1294,6 @@
else
glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, 180.0);
}
-
- power= (ELEM(la->type, LA_SUN, LA_HEMI))? la->energy*M_PI: la->energy*M_PI; //XXX la->power
/* setup energy */
mul_v3_v3fl(energy, &la->r, la->energy);
Modified: branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
===================================================================
--- branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl 2011-05-12 09:02:39 UTC (rev 36638)
@@ -1751,6 +1751,11 @@
}
}
+void shade_exposure_correct(vec3 col, float linfac, float logfac, out vec3 outcol)
+{
+ outcol = linfac*(1.0 - exp(col*logfac));
+}
+
void shade_mist_factor(vec3 co, float miststa, float mistdist, float misttype, float misi, out float outfac)
{
float fac, zcor;
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_color_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_color_types.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_color_types.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -51,8 +51,6 @@
#define CUMA_SELECT 1
#define CUMA_VECTOR 2
-struct CurveMapPoint;
-
typedef struct CurveMap {
short totpoint, flag;
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -76,20 +76,20 @@
#define CD_MFACE 4
#define CD_MTFACE 5
#define CD_MCOL 6
-#define CD_ORIGINDEX 7
+#define CD_ORIGINDEX 7
#define CD_NORMAL 8
#define CD_FLAGS 9
#define CD_PROP_FLT 10
#define CD_PROP_INT 11
#define CD_PROP_STR 12
-#define CD_ORIGSPACE 13 /* for modifier stack face location mapping */
+#define CD_ORIGSPACE 13 /* for modifier stack face location mapping */
#define CD_ORCO 14
#define CD_MTEXPOLY 15
#define CD_MLOOPUV 16
#define CD_MLOOPCOL 17
#define CD_TANGENT 18
#define CD_MDISPS 19
-#define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */
+#define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */
#define CD_MPOLY 21
#define CD_MLOOP 22
#define CD_CLOTH_ORCO 23
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_key_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_key_types.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_key_types.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -45,7 +45,7 @@
float pos;
float curval;
short type, adrcode, relative, flag; /* relative == 0 means first key is reference */
- int totelem, pad;
+ int totelem, pad2;
void *data;
float *weights;
@@ -55,7 +55,7 @@
float slidermin;
float slidermax;
- int uid, pad2;
+ int uid, pad3;
} KeyBlock;
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -131,7 +131,7 @@
/* materials */
struct Material **mat; /* material slots */
- char *matbits; /* a boolean field, with each byte 1 if corrusponding material is linked to object */
+ char *matbits; /* a boolean field, with each byte 1 if corrusponding material is linked to object */
int totcol; /* copy of mesh or curve or meta */
int actcol; /* currently selected material in the UI */
@@ -413,7 +413,6 @@
#define OB_BOUND_POLYT 5
/* #define OB_BOUND_DYN_MESH 6 */ /*UNUSED*/
#define OB_BOUND_CAPSULE 7
-#define OB_BOUND_CAPSULE 7
/* **************** BASE ********************* */
@@ -434,7 +433,7 @@
/* an initial attempt as making selection more specific! */
-#define BA_DESELECT 0
+#define BA_DESELECT 0
#define BA_SELECT 1
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -236,9 +236,6 @@
char hpad[7];
char preview_back[4];
-
- char pin[4];
- int pin_opac;
} ThemeSpace;
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h 2011-05-12 09:02:39 UTC (rev 36638)
@@ -194,7 +194,6 @@
ListBase subwindows; /* opengl stuff for sub windows, see notes in wm_subwindow.c */
ListBase gesture; /* gesture stuff */
- double lasttime;
} wmWindow;
/* should be somthing like DNA_EXCLUDE
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c 2011-05-12 08:34:31 UTC (rev 36637)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c 2011-05-12 09:02:39 UTC (rev 36638)
@@ -30,6 +30,7 @@
* \ingroup RNA
*/
+
#include <stdlib.h>
#include "RNA_define.h"
@@ -42,6 +43,8 @@
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
+#include "WM_types.h"
+
#ifdef RNA_RUNTIME
#include "DNA_scene_types.h"
@@ -55,18 +58,18 @@
#include "BKE_mesh.h"
#include "BKE_tessmesh.h"
+#include "ED_mesh.h" /* XXX Bad level call */
+
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_mesh.h"
-
static void rna_Mesh_update_data(Main *bmain, Scene *scene, PointerRNA *ptr)
{
ID *id= ptr->id.data;
/* cheating way for importers to avoid slow updates */
if(id->us > 0) {
- DAG_id_tag_update(id, OB_RECALC_DATA);
+ DAG_id_tag_update(id, 0);
WM_main_add_notifier(NC_GEOM|ND_DATA, id);
}
}
@@ -1312,7 +1315,7 @@
prop= RNA_def_property(srna, "use_twoside", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TWOSIDE);
- RNA_def_property_ui_text(prop, "Twoside", "Render face twosided");
+ RNA_def_property_ui_text(prop, "Two-side", "Render face two-sided");
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
prop= RNA_def_property(srna, "use_object_color", PROP_BOOLEAN, PROP_NONE);
@@ -1420,7 +1423,6 @@
RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
RNA_def_property_boolean_funcs(prop, "rna_MeshColorLayer_active_render_get", "rna_MeshColorLayer_active_render_set");
RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering");
-
RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list