Commit: 87f054e7d82baa6fa7ce0e27c3b35d53e7d18c6d
Author: Julian Eisel
Date: Sat Feb 6 20:25:24 2016 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB87f054e7d82baa6fa7ce0e27c3b35d53e7d18c6d
Merge branch 'master' into temp_widgets_c++_experiment
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_transform.h
source/blender/editors/interface/resources.c
source/blender/editors/screen/glutil.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform_manipulator.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/windowmanager/SConscript
source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_blender.h
index 6886740,8d8589c..e7060e6
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -42,10 -42,10 +42,10 @@@ extern "C"
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 276
- #define BLENDER_SUBVERSION 4
-#define BLENDER_SUBVERSION 10
++#define BLENDER_SUBVERSION 11
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
- #define BLENDER_MINSUBVERSION 5
+ #define BLENDER_MINSUBVERSION 6
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
diff --cc source/blender/blenloader/intern/readfile.c
index 049879f,2935b11..9cb56b1
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -3205,28 -3214,23 +3215,29 @@@ static void lib_link_pose(FileData *fd
/* sync proxy active bone */
if (pose->proxy_act_bone[0]) {
- Bone *bone = BKE_armature_find_bone_name(arm,
pose->proxy_act_bone);
- if (bone)
+ Bone *bone = BLI_ghash_lookup(bone_hash,
pose->proxy_act_bone);
+ if (bone) {
arm->act_bone = bone;
+ }
}
}
-
- for (pchan = pose->chanbase.first; pchan; pchan=pchan->next) {
+
+ for (bPoseChannel *pchan = pose->chanbase.first; pchan; pchan =
pchan->next) {
lib_link_constraints(fd, (ID *)ob, &pchan->constraints);
-
- /* hurms... loop in a loop, but yah... later... (ton) */
- pchan->bone = BKE_armature_find_bone_name(arm, pchan->name);
+
+ pchan->bone = BLI_ghash_lookup(bone_hash, pchan->name);
-
+
+ pchan->fmap_object = newlibadr_us(fd, arm->id.lib,
pchan->fmap_object);
+ if (pchan->fmap_object) {
+ /* fix fmap pointer now that we've got updated
fmap_object */
+ pchan->fmap = fmap_find_name(pchan->fmap_object,
pchan->fmap->name);
+ }
+
pchan->custom = newlibadr_us(fd, arm->id.lib, pchan->custom);
- if (pchan->bone == NULL)
- rebuild= 1;
- else if (ob->id.lib==NULL && arm->id.lib) {
+ if (UNLIKELY(pchan->bone == NULL)) {
+ rebuild = true;
+ }
+ else if ((ob->id.lib == NULL) && arm->id.lib) {
/* local pose selection copied to armature, bit hackish
*/
pchan->bone->flag &= ~BONE_SELECTED;
pchan->bone->flag |= pchan->selectflag;
diff --cc source/blender/blenloader/intern/versioning_270.c
index ffc50cd,1ce9bca..df943c4
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1036,43 -1037,24 +1037,62 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
+ if (!MAIN_VERSION_ATLEAST(main, 276, 5)) {
+ ListBase *lbarray[MAX_LIBARRAY];
+ int a;
+
+ /* Important to clear all non-persistent flags from older
versions here, otherwise they could collide
+ * with any new persistent flag we may add in the future. */
+ a = set_listbasepointers(main, lbarray);
+ while (a--) {
+ for (ID *id = lbarray[a]->first; id; id = id->next) {
+ id->flag &= LIB_FAKEUSER;
+ }
+ }
+ }
+ if (!MAIN_VERSION_ATLEAST(main, 276, 7)) {
+ Scene *scene;
+ for (scene = main->scene.first; scene != NULL; scene =
scene->id.next) {
+ scene->r.bake.pass_filter = R_BAKE_PASS_FILTER_ALL;
+ }
+ }
+ {
+ if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float",
"backdrop_zoom")) {
+ bScreen *sc;
+ for (sc = main->screen.first; sc; sc = sc->id.next) {
+ ScrArea *sa;
+ for (sa = sc->areabase.first; sa; sa =
sa->next) {
+ SpaceLink *sl;
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ if (sl->spacetype ==
SPACE_NODE) {
+ SpaceNode *snode =
(SpaceNode *)sl;
+ snode->backdrop_zoom =
1.0;
+ }
+ if (sl->spacetype == SPACE_SEQ)
{
+ SpaceSeq *sseq =
(SpaceSeq *)sl;
+ sseq->overdrop_zoom =
1.0;
+ }
+ }
+ }
+ }
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float",
"backdrop_zoom")) {
+ bScreen *sc;
+ for (sc = main->screen.first; sc; sc = sc->id.next) {
+ ScrArea *sa;
+ for (sa = sc->areabase.first; sa; sa =
sa->next) {
+ SpaceLink *sl;
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ if (sl->spacetype == SPACE_IPO)
{
+ SpaceIpo *sipo =
(SpaceIpo *)sl;
+ sipo->backdrop_zoom =
1.0f;
+ sipo->backdrop_opacity
= 0.7f;
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --cc source/blender/editors/include/ED_transform.h
index 05cae80,db8085a..f5706f2
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@@ -114,8 -109,7 +114,9 @@@ struct ScrArea
struct Base;
struct Scene;
struct Object;
+struct wmWidgetGroup;
+struct wmWidgetGroupType;
+ struct wmOperator;
/* UNUSED */
// int BIF_snappingSupported(struct Object *obedit);
diff --cc source/blender/editors/interface/resources.c
index dc46b31,c23df5c..7d5abef
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2676,15 -2678,37 +2676,46 @@@ void init_userdef_do_versions(void
}
}
- if (!USER_VERSION_ATLEAST(276, 4)) {
+ if (!USER_VERSION_ATLEAST(276, 8)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ rgba_char_args_set(btheme->tui.wcol_progress.item, 128,
128, 128, 255);
+ }
+ }
+
+ if (!USER_VERSION_ATLEAST(276, 10)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ /* 3dView Keyframe Indicators */
+ rgba_char_args_set(btheme->tv3d.time_keyframe, 0xDD,
0xD7, 0x00, 1.0);
+ rgba_char_args_set(btheme->tv3d.time_gp_keyframe, 0xB5,
0xE6, 0x1D, 1.0);
+ }
+ }
+
+ /**
+ * Include next version bump.
+ *
+ * (keep this block even if it becomes empty).
+ */
+ {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ if (memcmp(btheme->tui.wcol_list_item.item,
btheme->tui.wcol_list_item.text_sel, sizeof(char) * 3) == 0) {
+
copy_v4_v4_char(btheme->tui.wcol_list_item.item, btheme->tui.wcol_text.item);
+
copy_v4_v4_char(btheme->tui.wcol_list_item.text_sel,
btheme->tui.wcol_text.text_sel);
+ }
+ }
+ }
+
++ if (!USER_VERSION_ATLEAST(276, 11)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ rgba_char_args_set_fl(btheme->tui.xaxis, 1.0f, 0.27f,
0.27f, 1.0f); /* red */
+ rgba_char_args_set_fl(btheme->tui.yaxis, 0.27f, 1.0f,
0.27f, 1.0f); /* green */
+ rgba_char_args_set_fl(btheme->tui.zaxis, 0.27f, 0.27f,
1.0f, 1.0f); /* blue */
+ }
+ }
+
if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f;
diff --cc source/blender/editors/screen/glutil.c
index b83eb52,b7ad911..6723b49
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@@ -824,102 -730,7 +731,6 @@@ void glaEnd2DDraw(gla2DDrawInfo *di
}
#endif
- /* **************** GL_POINT hack ************************ */
-
- static int curmode = 0;
- static int pointhack = 0;
- static GLubyte Squaredot[16] = {0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff};
-
- void bglBegin(int mode)
- {
- curmode = mode;
-
- if (mode == GL_POINTS) {
- float value[4];
- glGetFloatv(GL_POINT_SIZE_RANGE, value);
- if (value[1] < 2.0f) {
- glGetFloatv(GL_POINT_SIZE, value);
- pointhack = iroundf(value[0]);
- if (pointhack > 4) pointhack = 4;
- }
- else {
- glBegin(mode);
- }
- }
- }
-
- #if 0 /* UNUSED */
- int bglPointHack(void)
- {
- float value[4];
- int pointhack_px;
- glGetFloatv(GL_POINT_SIZE_RANGE, value);
- if (value[1] < 2.0f) {
- glGetFloatv(GL_POINT_SIZE, value);
- pointhack_px = floorf(value[0] + 0.5f);
- if (pointhack_px > 4) pointhack_px = 4;
- return pointhack_px;
- }
- return 0;
- }
- #endif
-
- void bglVertex3fv(const float vec[3])
- {
- switch (curmode) {
- case GL_POINTS:
- if (pointhack) {
- glRasterPos3fv(vec);
- glBitmap(pointhack, pointhack, (float)pointhack
/ 2.0f, (float)pointhack / 2.0f, 0.0, 0.0, Squaredot);
- }
- else {
- glVertex3fv(vec);
- }
- break;
- }
- }
-
- void bglVertex3f(float x, float y, float z)
- {
- switch (curmode) {
- case GL_POINTS:
- if (pointhack) {
- glRasterPos3f(x, y, z);
- glBitmap(pointhack, pointhack, (float)pointhack
/ 2.0f, (float)pointhack / 2.0f, 0.0, 0.0, Squaredot);
- }
- else {
- glVertex3f(x, y, z);
- }
- break;
- }
- }
-
- void bglVertex2fv(const float vec[2])
- {
- switch (curmode) {
- case GL_POINTS:
- if (pointhack) {
- glRasterPos2fv(vec);
- glBitmap(pointhack, pointhack, (float)pointhack
/ 2, pointhack / 2, 0.0, 0.0, Squaredot);
- }
- else {
- glVertex2fv(vec);
- }
- break;
- }
- }
-
-
- void bglEnd(void)
- {
- if (pointhack) pointhack = 0;
- else glEnd();
-
- }
--
/* Uses current OpenGL state to get view matrices for gluProject/gluUnProject
*/
void bgl_get_mats(bglMats *mats)
{
diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index 6075af0,5793c8e..16e605f8
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1218,8 -1219,8 +1219,8 @@@ void draw_image_seq(const bContext *C,
}
}
- if (!draw_backdrop) {
+ if (!draw_overdrop) {
- sequencer_draw_background(sseq, v2d, viewrect);
+ sequencer_draw_background(sseq, v2d, viewrect, draw_overlay);
}
if (scope) {
diff --cc source/blender/editors/space_view3d/drawarmature.c
index f0907bb,ff58724..5435dbb
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@@ -90,7 -90,9 +90,9 @@@ static void set_pchan_colorset(Object *
{
bPose *pose = (ob) ? ob->pose : NULL;
bArmature *arm = (ob) ? ob->data : NULL;
+ bActionGroup *grp = NULL;
+ short color_index = 0;
-
+
/* sanity check */
if (ELEM(NULL, ob, arm, pose, pchan)) {
bcolor = NULL;
diff --cc source/blender/editors
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
